fix: nested api resources (#8)

* fix: update nested resource endpoints

* fix: add animetheme back to global search

docs/.vuepress/config.js

@@ -34,11 +34,53 @@ module.exports = {
           },
           {
             title: 'Year Index',
-            to: '/year/index/'
+            to: '/animeyear/index/'
           },
           {
             title: 'Year Show',
-            to: '/year/show/'
+            to: '/animeyear/show/'
+          }
+        ]
+      },
+      'animesynonym': {
+        title: 'Resource',
+        to: '/animesynonym',
+        children: [
+          {
+            title: 'Show',
+            to: '/animesynonym/show/',
+          },
+          {
+            title: 'Index',
+            to: '/animesynonym/index/'
+          }
+        ]
+      },
+      'animetheme': {
+        title: 'Resource',
+        to: '/animetheme',
+        children: [
+          {
+            title: 'Show',
+            to: '/animetheme/show/',
+          },
+          {
+            title: 'Index',
+            to: '/animetheme/index/'
+          }
+        ]
+      },
+      'animethemeentry': {
+        title: 'Resource',
+        to: '/animethemeentry',
+        children: [
+          {
+            title: 'Show',
+            to: '/animethemeentry/show/',
+          },
+          {
+            title: 'Index',
+            to: '/animethemeentry/index/'
           }
         ]
       },
@@ -84,20 +126,6 @@ module.exports = {
           }
         ]
       },
-      'entry': {
-        title: 'Resource',
-        to: '/entry',
-        children: [
-          {
-            title: 'Show',
-            to: '/entry/show/',
-          },
-          {
-            title: 'Index',
-            to: '/entry/index/'
-          }
-        ]
-      },
       'image': {
         title: 'Resource',
         to: '/image',
@@ -154,34 +182,6 @@ module.exports = {
           }
         ]
       },
-      'synonym': {
-        title: 'Resource',
-        to: '/synonym',
-        children: [
-          {
-            title: 'Show',
-            to: '/synonym/show/',
-          },
-          {
-            title: 'Index',
-            to: '/synonym/index/'
-          }
-        ]
-      },
-      'theme': {
-        title: 'Resource',
-        to: '/theme',
-        children: [
-          {
-            title: 'Show',
-            to: '/theme/show/',
-          },
-          {
-            title: 'Index',
-            to: '/theme/index/'
-          }
-        ]
-      },
       'transaction': {
         title: 'Resource',
         to: '/transaction',

docs/anime/README.md

@@ -26,12 +26,12 @@ For example, Bakemonogatari is an anime production with five opening sequences a
 
 ### Allowed Include Paths
 
-* synonyms
+* animesynonyms
 * series
-* themes
-* themes.entries.videos
-* themes.song
-* themes.song.artists
+* animethemes
+* animethemes.animethemeentries.videos
+* animethemes.song
+* animethemes.song.artists
 * resources
 * images
 

docs/animesynonym/README.md

@@ -1,14 +1,14 @@
 ---
-title: Synonym
+title: AnimeSynonym
 ---
 
-# Synonym
+# AnimeSynonym
 
 ---
 
-A synonym API resource represents an alternate title or common abbreviation for an anime.
+An AnimeSynonym API resource represents an alternate title or common abbreviation for an anime.
 
-For example, the anime Bakemonogatari has the synonym "Ghostory".
+For example, the anime Bakemonogatari has the AnimeSynonym "Ghostory".
 
 ### Fields
 
@@ -26,10 +26,10 @@ For example, the anime Bakemonogatari has the synonym "Ghostory".
 
 ### Endpoints
 
-**[Synonym Show](/synonym/show/)**
+**[AnimeSynonym Show](/animesynonym/show/)**
 
-The synonym show endpoint returns a synonym resource.
+The AnimeSynonym show endpoint returns an AnimeSynonym resource.
 
-**[Synonym Index](/synonym/index/)**
+**[AnimeSynonym Index](/animesynonym/index/)**
 
-The synonym index endpoint displays a listing of synonym resources.
+The AnimeSynonym index endpoint displays a listing of AnimeSynonym resources.

docs/animesynonym/index/README.md

@@ -1,17 +1,17 @@
 ---
-title: Synonym Index
+title: AnimeSynonym Index
 ---
 
 <Block>
 
-# Synonym Index Endpoint
+# AnimeSynonym Index Endpoint
 
-The synonym index endpoint returns a listing of synonym resources.
+The AnimeSynonym index endpoint returns a listing of AnimeSynonym resources.
 
 ## URL
 
 ```sh
-GET /api/synonym/
+GET /api/animesynonym/
 ```
 
 ## Parameters
@@ -52,7 +52,7 @@ GET /api/synonym/
 
 ```json
 {
-    synonyms: [
+    animesynonyms: [
         {
             id: id,
             text: "text",
@@ -82,7 +82,7 @@ GET /api/synonym/
 
 <CURL>
 ```bash
-curl https://staging.animethemes.moe/api/synonym/
+curl https://staging.animethemes.moe/api/animesynonym/
 ```
 </CURL>
 

docs/animesynonym/show/README.md

@@ -1,19 +1,19 @@
 ---
-title: Synonym Show
+title: AnimeSynonym Show
 ---
 
 <Block>
 
-# Synonym Show Endpoint
+# AnimeSynonym Show Endpoint
 
-The synonym show endpoint returns a synonym resource.
+The AnimeSynonym show endpoint returns an AnimeSynonym resource.
 
-For example, the `/api/synonym/1523` endpoint will return the synonym resource "Ghostory" for the anime Bakemonogatari.
+For example, the `/api/animesynonym/1523` endpoint will return the AnimeSynonym resource "Ghostory" for the anime Bakemonogatari.
 
 ## URL
 
 ```sh
-GET /api/synonym/{id}
+GET /api/animesynonym/{id}
 ```
 
 ## Parameters
@@ -28,7 +28,7 @@ GET /api/synonym/{id}
 
 ```json
 {
-    synonym: {
+    animesynonym: {
         id: id,
         text: "text",
         created_at: "created_at",
@@ -42,7 +42,7 @@ GET /api/synonym/{id}
 
 <CURL>
 ```bash
-curl https://staging.animethemes.moe/api/synonym/1523
+curl https://staging.animethemes.moe/api/animesynonym/1523
 ```
 </CURL>
 

docs/animetheme/README.md

@@ -1,14 +1,14 @@
 ---
-title: Theme
+title: AnimeTheme
 ---
 
-# Theme
+# AnimeTheme
 
 ---
 
-A theme API resource represents an OP or ED sequence for an anime.
+An AnimeTheme API resource represents an OP or ED sequence for an anime.
 
-For example, the anime Bakemonogatari has five OP themes and one ED theme.
+For example, the anime Bakemonogatari has five OP AnimeThemes and one ED AnimeTheme.
 
 ### Fields
 
@@ -27,17 +27,17 @@ For example, the anime Bakemonogatari has five OP themes and one ED theme.
 
 * anime
 * anime.images
-* entries
-* entries.videos
+* animethemeentries
+* animethemeentries.videos
 * song
 * song.artists
 
 ### Endpoints
 
-**[Theme Show](/theme/show/)**
+**[AnimeTheme Show](/animetheme/show/)**
 
-The theme show endpoint returns a theme resource.
+The AnimeTheme show endpoint returns an AnimeTheme resource.
 
-**[Theme Index](/theme/index/)**
+**[AnimeTheme Index](/animetheme/index/)**
 
-The theme index endpoint displays a listing of theme resources.
+The AnimeTheme index endpoint displays a listing of AnimeTheme resources.

docs/animetheme/index/README.md

@@ -1,17 +1,17 @@
 ---
-title: Theme Index
+title: AnimeTheme Index
 ---
 
 <Block>
 
-# Theme Index Endpoint
+# AnimeTheme Index Endpoint
 
-The theme index endpoint returns a listing of theme resources.
+The AnimeTheme index endpoint returns a listing of AnimeTheme resources.
 
 ## URL
 
 ```sh
-GET /api/theme/
+GET /api/animetheme/
 ```
 
 ## Parameters
@@ -58,7 +58,7 @@ GET /api/theme/
 
 ```json
 {
-    themes: [
+    animethemes: [
         {
             id: id,
             type: "type",
@@ -91,7 +91,7 @@ GET /api/theme/
 
 <CURL>
 ```bash
-curl https://staging.animethemes.moe/api/theme/
+curl https://staging.animethemes.moe/api/animetheme/
 ```
 </CURL>
 

docs/animetheme/show/README.md

@@ -1,19 +1,19 @@
 ---
-title: Theme Show
+title: AnimeTheme Show
 ---
 
 <Block>
 
-# Theme Show Endpoint
+# AnimeTheme Show Endpoint
 
-The theme show endpoint returns a theme resource.
+The AnimeTheme show endpoint returns an AnimeTheme resource.
 
-For example, the `/api/theme/3373` endpoint will return the theme resource Bakemonogatari OP1.
+For example, the `/api/animetheme/3373` endpoint will return the AnimeTheme resource Bakemonogatari OP1.
 
 ## URL
 
 ```sh
-GET /api/theme/{id}
+GET /api/animetheme/{id}
 ```
 
 ## Parameters
@@ -28,7 +28,7 @@ GET /api/theme/{id}
 
 ```json
 {
-    theme: {
+    animetheme: {
         id: id,
         type: "type",
         sequence: sequence,
@@ -45,7 +45,7 @@ GET /api/theme/{id}
 
 <CURL>
 ```bash
-curl https://staging.animethemes.moe/api/theme/3373
+curl https://staging.animethemes.moe/api/animetheme/3373
 ```
 </CURL>
 

docs/animethemeentry/README.md

@@ -1,14 +1,14 @@
 ---
-title: Entry
+title: AnimeThemeEntry
 ---
 
-# Entry
+# AnimeThemeEntry
 
 ---
 
-An entry API resource represents a version of an anime theme.
+An AnimeThemeEntry API resource represents a version of an AnimeTheme.
 
-For example, the Bakemonogatari ED theme has three entries to represent three versions.
+For example, the Bakemonogatari ED theme has three AnimeThemeEntries to represent three versions.
 
 ### Fields
 
@@ -26,16 +26,16 @@ For example, the Bakemonogatari ED theme has three entries to represent three ve
 
 ### Allowed Include Paths
 
-* theme
-* theme.anime
+* animetheme
+* animetheme.anime
 * videos
 
 ### Endpoints
 
-**[Entry Show](/entry/show/)**
+**[AnimeThemeEntry Show](/animethemeentry/show/)**
 
-The entry show endpoint returns an entry resource.
+The AnimeThemeEntry show endpoint returns an AnimeThemeEntry resource.
 
-**[Entry Index](/entry/index/)**
+**[AnimeThemeEntry Index](/animethemeentry/index/)**
 
-The entry index endpoint displays a listing of entry resources.
+The AnimeThemeEntry index endpoint displays a listing of AnimeThemeEntry resources.

docs/animethemeentry/index/README.md

@@ -1,17 +1,17 @@
 ---
-title: Entry Index
+title: AnimeThemeEntry Index
 ---
 
 <Block>
 
-# Entry Index Endpoint
+# AnimeThemeEntry Index Endpoint
 
-The entry index endpoint returns a listing of entry resources.
+The AnimeThemeEntry index endpoint returns a listing of AnimeThemeEntry resources.
 
 ## URL
 
 ```sh
-GET /api/entry/
+GET /api/animethemeentry/
 ```
 
 ## Parameters
@@ -60,7 +60,7 @@ GET /api/entry/
 
 ```json
 {
-    entries: [
+    animethemeentries: [
         {
             id: id,
             version: version,
@@ -94,7 +94,7 @@ GET /api/entry/
 
 <CURL>
 ```bash
-curl https://staging.animethemes.moe/api/entry/
+curl https://staging.animethemes.moe/api/animethemeentry/
 ```
 </CURL>
 

docs/animethemeentry/show/README.md

@@ -1,20 +1,20 @@
 ---
-title: Entry Show
+title: AnimeThemeEntry Show
 ---
 
 <Block>
 
-# Entry Show Endpoint
+# AnimeThemeEntry Show Endpoint
 
-The entry show endpoint returns an entry resource.
+The AnimeThemeEntry show endpoint returns an AnimeThemeEntry resource.
 
-For example, the `/api/entry/3822` endpoint will return the second version of the Bakemonogatari ED theme.
+For example, the `/api/animethemeentry/3822` endpoint will return the second version of the Bakemonogatari ED AnimeTheme.
 
 ## URL
 
 ```sh
-GET /api/entry/{id}
-```00
+GET /api/animethemeentry/{id}
+```
 
 ## Parameters
 
@@ -28,7 +28,7 @@ GET /api/entry/{id}
 
 ```json
 {
-    entry: {
+    animethemeentry: {
         id: id,
         version: version,
         episodes: "episodes",
@@ -46,7 +46,7 @@ GET /api/entry/{id}
 
 <CURL>
 ```bash
-curl https://staging.animethemes.moe/api/entry/3822
+curl https://staging.animethemes.moe/api/animethemeentry/3822
 ```
 </CURL>
 

docs/animeyear/index/README.md

@@ -11,7 +11,7 @@ The year index endpoint returns a list of unique years from all anime resources.
 ## URL
 
 ```sh
-GET /api/year/
+GET /api/animeyear/
 ```
 
 ## Parameters
@@ -33,7 +33,7 @@ None
 
 <CURL>
 ```bash
-curl https://staging.animethemes.moe/api/year/
+curl https://staging.animethemes.moe/api/animeyear/
 ```
 </CURL>
 

docs/animeyear/show/README.md

@@ -8,12 +8,12 @@ title: Year Show
 
 The year show endpoint return a listing of anime resources for a given year grouped by season and ordered by name.
 
-For example, the `/api/year/2000` endpoint will return a listing of anime resources of year 2000 grouped by season and ordered by name.
+For example, the `/api/animeyear/2000` endpoint will return a listing of anime resources of year 2000 grouped by season and ordered by name.
 
 ## URL
 
 ```sh
-GET /api/year/{year}
+GET /api/animeyear/{year}
 ```
 
 ## Parameters
@@ -91,7 +91,7 @@ GET /api/year/{year}
 
 <CURL>
 ```bash
-curl https://staging.animethemes.moe/api/year/2000
+curl https://staging.animethemes.moe/api/animeyear/2000
 ```
 </CURL>
 

docs/artist/README.md

@@ -25,8 +25,8 @@ For example, Chiwa Saito is the musical performer of the Bakemonogatari OP1 them
 ### Allowed Include Paths
 
 * songs
-* songs.themes
-* songs.themes.anime
+* songs.animethemes
+* songs.animethemes.anime
 * members
 * groups
 * resources

docs/search/README.md

@@ -42,24 +42,23 @@ GET /api/search/
                 deleted_at: "deleted_at"
             }
         ],
-        artists: [
+        animethemes: [
             {
                 id: id,
-                name: "name",
+                type: "type",
+                sequence: sequence,
+                group: "group",
                 slug: "slug",
                 created_at: "created_at",
                 updated_at: "updated_at",
                 deleted_at: "deleted_at"
             }
         ],
-        entries: [
+        artists: [
             {
                 id: id,
-                version: version,
-                episodes: "episodes",
-                nsfw: nsfw,
-                spoiler: spoiler,
-                notes: "notes",
+                name: "name",
+                slug: "slug",
                 created_at: "created_at",
                 updated_at: "updated_at",
                 deleted_at: "deleted_at"
@@ -84,27 +83,6 @@ GET /api/search/
                 deleted_at: "deleted_at"
             }
         ],
-        synonyms: [
-            {
-                id: id,
-                text: "text",
-                created_at: "created_at",
-                updated_at: "updated_at",
-                deleted_at: "deleted_at"
-            }        
-        ],
-        themes: [
-            {
-                id: id,
-                type: "type",
-                sequence: sequence,
-                group: "group",
-                slug: "slug",
-                created_at: "created_at",
-                updated_at: "updated_at",
-                deleted_at: "deleted_at"
-            }
-        ],
         videos: [
             {
                 id: id,

docs/song/README.md

@@ -6,9 +6,9 @@ title: Song
 
 ---
 
-A song API resource represents the composition that accompanies an anime theme.
+A song API resource represents the composition that accompanies an AnimeTheme.
 
-For example, Staple Stable is the song for the Bakemonogatari OP1 theme.
+For example, Staple Stable is the song for the Bakemonogatari OP1 AnimeTheme.
 
 ### Fields
 
@@ -23,8 +23,8 @@ For example, Staple Stable is the song for the Bakemonogatari OP1 theme.
 
 ### Allowed Include Paths
 
-* themes
-* themes.anime
+* animethemes
+* animethemes.anime
 * artists
 
 ### Endpoints

docs/video/README.md

@@ -35,9 +35,9 @@ For example, the video Bakemonogatari-OP1.webm represents the WebM of the Bakemo
 
 ### Allowed Include Paths
 
-* entries
-* entries.theme
-* entries.theme.anime
+* animethemeentries
+* animethemeentries.animetheme
+* animethemeentries.animetheme.anime
 
 ### Endpoints
 

package-lock.json

@@ -391,14 +391,14 @@
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.14.8",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.14.8.tgz",
-      "integrity": "sha512-ZRDmI56pnV+p1dH6d+UN6GINGz7Krps3+270qqI9UJ4wxYThfAIcI5i7j5vXC4FJ3Wap+S9qcebxeYiqn87DZw==",
+      "version": "7.15.3",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.15.3.tgz",
+      "integrity": "sha512-HwJiz52XaS96lX+28Tnbu31VeFSQJGOeKHJeaEPQlTl7PnlhFElWPj8tUXtqFIzeN86XxXoBr+WFAyK2PPVz6g==",
       "dev": true,
       "dependencies": {
         "@babel/template": "^7.14.5",
-        "@babel/traverse": "^7.14.8",
-        "@babel/types": "^7.14.8"
+        "@babel/traverse": "^7.15.0",
+        "@babel/types": "^7.15.0"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -419,9 +419,9 @@
       }
     },
     "node_modules/@babel/parser": {
-      "version": "7.15.2",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.2.tgz",
-      "integrity": "sha512-bMJXql1Ss8lFnvr11TZDH4ArtwlAS5NG9qBmdiFW2UHHm6MVoR+GDc5XE2b9K938cyjc9O6/+vjjcffLDtfuDg==",
+      "version": "7.15.3",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.3.tgz",
+      "integrity": "sha512-O0L6v/HvqbdJawj0iBEfVQMc3/6WP+AeOsovsIgBFyJaG+W2w7eqvZB7puddATmWuARlm1SX7DwxJ/JJUnDpEA==",
       "dev": true,
       "bin": {
         "parser": "bin/babel-parser.js"
@@ -967,9 +967,9 @@
       }
     },
     "node_modules/@babel/plugin-transform-block-scoping": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.5.tgz",
-      "integrity": "sha512-LBYm4ZocNgoCqyxMLoOnwpsmQ18HWTQvql64t3GvMUzLQrNoV1BDG0lNftC8QKYERkZgCCT/7J5xWGObGAyHDw==",
+      "version": "7.15.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.15.3.tgz",
+      "integrity": "sha512-nBAzfZwZb4DkaGtOes1Up1nOAp9TDRRFw4XBzBBSG9QK7KVFmYzgj9o9sbPv7TX5ofL4Auq4wZnxCoPnI/lz2Q==",
       "dev": true,
       "dependencies": {
         "@babel/helper-plugin-utils": "^7.14.5"
@@ -1547,9 +1547,9 @@
       }
     },
     "node_modules/@babel/runtime": {
-      "version": "7.14.8",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.8.tgz",
-      "integrity": "sha512-twj3L8Og5SaCRCErB4x4ajbvBIVV77CGeFglHpeg5WC5FF8TZzBWXtTJ4MqaD9QszLYTtr+IsaAL2rEUevb+eg==",
+      "version": "7.15.3",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.3.tgz",
+      "integrity": "sha512-OvwMLqNXkCXSz1kSm58sEsNuhqOx/fKpnUnKnFB5v8uDda5bLNEHNgKPvhDN6IU0LDcnHQ90LlJ0Q6jnyBSIBA==",
       "dev": true,
       "dependencies": {
         "regenerator-runtime": "^0.13.4"
@@ -1671,9 +1671,9 @@
       "dev": true
     },
     "node_modules/@types/node": {
-      "version": "16.4.13",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.4.13.tgz",
-      "integrity": "sha512-bLL69sKtd25w7p1nvg9pigE4gtKVpGTPojBFLMkGHXuUgap2sLqQt2qUnqmVCDfzGUL0DRNZP+1prIZJbMeAXg==",
+      "version": "16.6.2",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.6.2.tgz",
+      "integrity": "sha512-LSw8TZt12ZudbpHc6EkIyDM3nHVWKYrAvGy6EAJfNfjusbwnThqjqxUKKRwuV3iWYeW/LYMzNgaq3MaLffQ2xA==",
       "dev": true
     },
     "node_modules/@types/q": {
@@ -3295,16 +3295,16 @@
       }
     },
     "node_modules/browserslist": {
-      "version": "4.16.7",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.7.tgz",
-      "integrity": "sha512-7I4qVwqZltJ7j37wObBe3SoTz+nS8APaNcrBOlgoirb6/HbEU2XxW/LpUDTCngM6iauwFqmRTuOMfyKnFGY5JA==",
+      "version": "4.16.8",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.8.tgz",
+      "integrity": "sha512-sc2m9ohR/49sWEbPj14ZSSZqp+kbi16aLao42Hmn3Z8FpjuMaq2xCA2l4zl9ITfyzvnvyE0hcg62YkIGKxgaNQ==",
       "dev": true,
       "dependencies": {
-        "caniuse-lite": "^1.0.30001248",
-        "colorette": "^1.2.2",
-        "electron-to-chromium": "^1.3.793",
+        "caniuse-lite": "^1.0.30001251",
+        "colorette": "^1.3.0",
+        "electron-to-chromium": "^1.3.811",
         "escalade": "^3.1.1",
-        "node-releases": "^1.1.73"
+        "node-releases": "^1.1.75"
       },
       "bin": {
         "browserslist": "cli.js"
@@ -3691,9 +3691,9 @@
       }
     },
     "node_modules/caniuse-lite": {
-      "version": "1.0.30001249",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001249.tgz",
-      "integrity": "sha512-vcX4U8lwVXPdqzPWi6cAJ3FnQaqXbBqy/GZseKNQzRj37J7qZdGcBtxq/QLFNLLlfsoXLUdHw8Iwenri86Tagw==",
+      "version": "1.0.30001251",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001251.tgz",
+      "integrity": "sha512-HOe1r+9VkU4TFmnU70z+r7OLmtR+/chB1rdcJUeQlAinjEeb0cKL20tlAtOagNZhbrtLnCvV19B4FmF1rgzl6A==",
       "dev": true,
       "funding": {
         "type": "opencollective",
@@ -4038,9 +4038,9 @@
       }
     },
     "node_modules/colorette": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz",
-      "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.3.0.tgz",
+      "integrity": "sha512-ecORCqbSFP7Wm8Y6lyqMJjexBQqXSF7SSeaTyGGphogUjBlFP9m9o08wy86HL2uB7fMTxtOUzLMk7ogKcxMg1w==",
       "dev": true
     },
     "node_modules/combined-stream": {
@@ -4443,9 +4443,9 @@
       }
     },
     "node_modules/core-js": {
-      "version": "3.16.1",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.16.1.tgz",
-      "integrity": "sha512-AAkP8i35EbefU+JddyWi12AWE9f2N/qr/pwnDtWz4nyUIBGMJPX99ANFFRSw6FefM374lDujdtLDyhN2A/btHw==",
+      "version": "3.16.2",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.16.2.tgz",
+      "integrity": "sha512-P0KPukO6OjMpjBtHSceAZEWlDD1M2Cpzpg6dBbrjFqFhBHe/BwhxaP820xKOjRn/lZRQirrCusIpLS/n2sgXLQ==",
       "dev": true,
       "hasInstallScript": true,
       "funding": {
@@ -4454,9 +4454,9 @@
       }
     },
     "node_modules/core-js-compat": {
-      "version": "3.16.1",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.16.1.tgz",
-      "integrity": "sha512-NHXQXvRbd4nxp9TEmooTJLUf94ySUG6+DSsscBpTftN1lQLQ4LjnWvc7AoIo4UjDsFF3hB8Uh5LLCRRdaiT5MQ==",
+      "version": "3.16.2",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.16.2.tgz",
+      "integrity": "sha512-4lUshXtBXsdmp8cDWh6KKiHUg40AjiuPD3bOWkNVsr1xkAhpUqCjaZ8lB1bKx9Gb5fXcbRbFJ4f4qpRIRTuJqQ==",
       "dev": true,
       "dependencies": {
         "browserslist": "^4.16.7",
@@ -5360,9 +5360,9 @@
       "dev": true
     },
     "node_modules/electron-to-chromium": {
-      "version": "1.3.799",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.799.tgz",
-      "integrity": "sha512-V2rbYWdGvSqrg+95KjkVuSi41bGfrhrOzjl1tSi2VLnm0mRe3FsSvhiqidSiSll9WiMhrQAhpDcW/wcqK3c+Yw==",
+      "version": "1.3.812",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.812.tgz",
+      "integrity": "sha512-7KiUHsKAWtSrjVoTSzxQ0nPLr/a+qoxNZwkwd9LkylTOgOXSVXkQbpIVT0WAUQcI5gXq3SwOTCrK+WfINHOXQg==",
       "dev": true
     },
     "node_modules/elliptic": {
@@ -6147,9 +6147,9 @@
       }
     },
     "node_modules/follow-redirects": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.1.tgz",
-      "integrity": "sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg==",
+      "version": "1.14.2",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.2.tgz",
+      "integrity": "sha512-yLR6WaE2lbF0x4K2qE2p9PEXKLDjUjnR/xmjS3wHAYxtlsI9MLLBJUZirAHKzUZDGLxje7w/cXR49WOUo4rbsA==",
       "funding": [
         {
           "type": "individual",
@@ -7321,10 +7321,13 @@
       "dev": true
     },
     "node_modules/is-bigint": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.3.tgz",
-      "integrity": "sha512-ZU538ajmYJmzysE5yU4Y7uIrPQ2j704u+hXFiIPQExpqzzUbpe5jCPdTfmz7jXRxZdvjY3KZ3ZNenoXQovX+Dg==",
+      "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"
       }
@@ -7402,9 +7405,9 @@
       }
     },
     "node_modules/is-core-module": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.5.0.tgz",
-      "integrity": "sha512-TXCMSDsEHMEEZ6eCA8rwRDbLu55MRGmrctljsBX/2v1d9/GzqHOxW5c5oPSgrUt2vBFXebu9rGqckXGPWOlYpg==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.6.0.tgz",
+      "integrity": "sha512-wShG8vs60jKfPWpF2KZRaAtvt3a20OAn7+IJ6hLPECpSABLcKtFKTTI4ZtH5QcBruBHlq+WsdHWyz0BCZW7svQ==",
       "dev": true,
       "dependencies": {
         "has": "^1.0.3"
@@ -8703,9 +8706,9 @@
       "dev": true
     },
     "node_modules/node-releases": {
-      "version": "1.1.73",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.73.tgz",
-      "integrity": "sha512-uW7fodD6pyW2FZNZnp/Z3hvWKeEW1Y8R1+1CnErE8cXFXzl5blBOoVB41CvMer6P6Q0S5FXDwcHgFd1Wj0U9zg==",
+      "version": "1.1.75",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.75.tgz",
+      "integrity": "sha512-Qe5OUajvqrqDSy6wrWFmMwfJ0jVgwiw4T3KqmbTcZ62qW0gQkheXYhcFM1+lOVcGUoRxcEcfyvFMAnDgaF1VWw==",
       "dev": true
     },
     "node_modules/nopt": {
@@ -14438,14 +14441,14 @@
       }
     },
     "@babel/helpers": {
-      "version": "7.14.8",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.14.8.tgz",
-      "integrity": "sha512-ZRDmI56pnV+p1dH6d+UN6GINGz7Krps3+270qqI9UJ4wxYThfAIcI5i7j5vXC4FJ3Wap+S9qcebxeYiqn87DZw==",
+      "version": "7.15.3",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.15.3.tgz",
+      "integrity": "sha512-HwJiz52XaS96lX+28Tnbu31VeFSQJGOeKHJeaEPQlTl7PnlhFElWPj8tUXtqFIzeN86XxXoBr+WFAyK2PPVz6g==",
       "dev": true,
       "requires": {
         "@babel/template": "^7.14.5",
-        "@babel/traverse": "^7.14.8",
-        "@babel/types": "^7.14.8"
+        "@babel/traverse": "^7.15.0",
+        "@babel/types": "^7.15.0"
       }
     },
     "@babel/highlight": {
@@ -14460,9 +14463,9 @@
       }
     },
     "@babel/parser": {
-      "version": "7.15.2",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.2.tgz",
-      "integrity": "sha512-bMJXql1Ss8lFnvr11TZDH4ArtwlAS5NG9qBmdiFW2UHHm6MVoR+GDc5XE2b9K938cyjc9O6/+vjjcffLDtfuDg==",
+      "version": "7.15.3",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.3.tgz",
+      "integrity": "sha512-O0L6v/HvqbdJawj0iBEfVQMc3/6WP+AeOsovsIgBFyJaG+W2w7eqvZB7puddATmWuARlm1SX7DwxJ/JJUnDpEA==",
       "dev": true
     },
     "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": {
@@ -14819,9 +14822,9 @@
       }
     },
     "@babel/plugin-transform-block-scoping": {
-      "version": "7.14.5",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.5.tgz",
-      "integrity": "sha512-LBYm4ZocNgoCqyxMLoOnwpsmQ18HWTQvql64t3GvMUzLQrNoV1BDG0lNftC8QKYERkZgCCT/7J5xWGObGAyHDw==",
+      "version": "7.15.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.15.3.tgz",
+      "integrity": "sha512-nBAzfZwZb4DkaGtOes1Up1nOAp9TDRRFw4XBzBBSG9QK7KVFmYzgj9o9sbPv7TX5ofL4Auq4wZnxCoPnI/lz2Q==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.14.5"
@@ -15210,9 +15213,9 @@
       }
     },
     "@babel/runtime": {
-      "version": "7.14.8",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.14.8.tgz",
-      "integrity": "sha512-twj3L8Og5SaCRCErB4x4ajbvBIVV77CGeFglHpeg5WC5FF8TZzBWXtTJ4MqaD9QszLYTtr+IsaAL2rEUevb+eg==",
+      "version": "7.15.3",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.3.tgz",
+      "integrity": "sha512-OvwMLqNXkCXSz1kSm58sEsNuhqOx/fKpnUnKnFB5v8uDda5bLNEHNgKPvhDN6IU0LDcnHQ90LlJ0Q6jnyBSIBA==",
       "dev": true,
       "requires": {
         "regenerator-runtime": "^0.13.4"
@@ -15310,9 +15313,9 @@
       "dev": true
     },
     "@types/node": {
-      "version": "16.4.13",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.4.13.tgz",
-      "integrity": "sha512-bLL69sKtd25w7p1nvg9pigE4gtKVpGTPojBFLMkGHXuUgap2sLqQt2qUnqmVCDfzGUL0DRNZP+1prIZJbMeAXg==",
+      "version": "16.6.2",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-16.6.2.tgz",
+      "integrity": "sha512-LSw8TZt12ZudbpHc6EkIyDM3nHVWKYrAvGy6EAJfNfjusbwnThqjqxUKKRwuV3iWYeW/LYMzNgaq3MaLffQ2xA==",
       "dev": true
     },
     "@types/q": {
@@ -16699,16 +16702,16 @@
       }
     },
     "browserslist": {
-      "version": "4.16.7",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.7.tgz",
-      "integrity": "sha512-7I4qVwqZltJ7j37wObBe3SoTz+nS8APaNcrBOlgoirb6/HbEU2XxW/LpUDTCngM6iauwFqmRTuOMfyKnFGY5JA==",
+      "version": "4.16.8",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.8.tgz",
+      "integrity": "sha512-sc2m9ohR/49sWEbPj14ZSSZqp+kbi16aLao42Hmn3Z8FpjuMaq2xCA2l4zl9ITfyzvnvyE0hcg62YkIGKxgaNQ==",
       "dev": true,
       "requires": {
-        "caniuse-lite": "^1.0.30001248",
-        "colorette": "^1.2.2",
-        "electron-to-chromium": "^1.3.793",
+        "caniuse-lite": "^1.0.30001251",
+        "colorette": "^1.3.0",
+        "electron-to-chromium": "^1.3.811",
         "escalade": "^3.1.1",
-        "node-releases": "^1.1.73"
+        "node-releases": "^1.1.75"
       }
     },
     "buffer": {
@@ -17016,9 +17019,9 @@
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30001249",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001249.tgz",
-      "integrity": "sha512-vcX4U8lwVXPdqzPWi6cAJ3FnQaqXbBqy/GZseKNQzRj37J7qZdGcBtxq/QLFNLLlfsoXLUdHw8Iwenri86Tagw==",
+      "version": "1.0.30001251",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001251.tgz",
+      "integrity": "sha512-HOe1r+9VkU4TFmnU70z+r7OLmtR+/chB1rdcJUeQlAinjEeb0cKL20tlAtOagNZhbrtLnCvV19B4FmF1rgzl6A==",
       "dev": true
     },
     "caseless": {
@@ -17306,9 +17309,9 @@
       }
     },
     "colorette": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz",
-      "integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==",
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.3.0.tgz",
+      "integrity": "sha512-ecORCqbSFP7Wm8Y6lyqMJjexBQqXSF7SSeaTyGGphogUjBlFP9m9o08wy86HL2uB7fMTxtOUzLMk7ogKcxMg1w==",
       "dev": true
     },
     "combined-stream": {
@@ -17638,15 +17641,15 @@
       }
     },
     "core-js": {
-      "version": "3.16.1",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.16.1.tgz",
-      "integrity": "sha512-AAkP8i35EbefU+JddyWi12AWE9f2N/qr/pwnDtWz4nyUIBGMJPX99ANFFRSw6FefM374lDujdtLDyhN2A/btHw==",
+      "version": "3.16.2",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.16.2.tgz",
+      "integrity": "sha512-P0KPukO6OjMpjBtHSceAZEWlDD1M2Cpzpg6dBbrjFqFhBHe/BwhxaP820xKOjRn/lZRQirrCusIpLS/n2sgXLQ==",
       "dev": true
     },
     "core-js-compat": {
-      "version": "3.16.1",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.16.1.tgz",
-      "integrity": "sha512-NHXQXvRbd4nxp9TEmooTJLUf94ySUG6+DSsscBpTftN1lQLQ4LjnWvc7AoIo4UjDsFF3hB8Uh5LLCRRdaiT5MQ==",
+      "version": "3.16.2",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.16.2.tgz",
+      "integrity": "sha512-4lUshXtBXsdmp8cDWh6KKiHUg40AjiuPD3bOWkNVsr1xkAhpUqCjaZ8lB1bKx9Gb5fXcbRbFJ4f4qpRIRTuJqQ==",
       "dev": true,
       "requires": {
         "browserslist": "^4.16.7",
@@ -18399,9 +18402,9 @@
       "dev": true
     },
     "electron-to-chromium": {
-      "version": "1.3.799",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.799.tgz",
-      "integrity": "sha512-V2rbYWdGvSqrg+95KjkVuSi41bGfrhrOzjl1tSi2VLnm0mRe3FsSvhiqidSiSll9WiMhrQAhpDcW/wcqK3c+Yw==",
+      "version": "1.3.812",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.812.tgz",
+      "integrity": "sha512-7KiUHsKAWtSrjVoTSzxQ0nPLr/a+qoxNZwkwd9LkylTOgOXSVXkQbpIVT0WAUQcI5gXq3SwOTCrK+WfINHOXQg==",
       "dev": true
     },
     "elliptic": {
@@ -19049,9 +19052,9 @@
       }
     },
     "follow-redirects": {
-      "version": "1.14.1",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.1.tgz",
-      "integrity": "sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg=="
+      "version": "1.14.2",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.2.tgz",
+      "integrity": "sha512-yLR6WaE2lbF0x4K2qE2p9PEXKLDjUjnR/xmjS3wHAYxtlsI9MLLBJUZirAHKzUZDGLxje7w/cXR49WOUo4rbsA=="
     },
     "for-in": {
       "version": "1.0.2",
@@ -19951,10 +19954,13 @@
       "dev": true
     },
     "is-bigint": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.0.3.tgz",
-      "integrity": "sha512-ZU538ajmYJmzysE5yU4Y7uIrPQ2j704u+hXFiIPQExpqzzUbpe5jCPdTfmz7jXRxZdvjY3KZ3ZNenoXQovX+Dg==",
-      "dev": true
+      "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-binary-path": {
       "version": "1.0.1",
@@ -20011,9 +20017,9 @@
       }
     },
     "is-core-module": {
-      "version": "2.5.0",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.5.0.tgz",
-      "integrity": "sha512-TXCMSDsEHMEEZ6eCA8rwRDbLu55MRGmrctljsBX/2v1d9/GzqHOxW5c5oPSgrUt2vBFXebu9rGqckXGPWOlYpg==",
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.6.0.tgz",
+      "integrity": "sha512-wShG8vs60jKfPWpF2KZRaAtvt3a20OAn7+IJ6hLPECpSABLcKtFKTTI4ZtH5QcBruBHlq+WsdHWyz0BCZW7svQ==",
       "dev": true,
       "requires": {
         "has": "^1.0.3"
@@ -21070,9 +21076,9 @@
       }
     },
     "node-releases": {
-      "version": "1.1.73",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.73.tgz",
-      "integrity": "sha512-uW7fodD6pyW2FZNZnp/Z3hvWKeEW1Y8R1+1CnErE8cXFXzl5blBOoVB41CvMer6P6Q0S5FXDwcHgFd1Wj0U9zg==",
+      "version": "1.1.75",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.75.tgz",
+      "integrity": "sha512-Qe5OUajvqrqDSy6wrWFmMwfJ0jVgwiw4T3KqmbTcZ62qW0gQkheXYhcFM1+lOVcGUoRxcEcfyvFMAnDgaF1VWw==",
       "dev": true
     },
     "nopt": {