diff --git a/README.md b/README.md
index c378bf099..03aaccfa7 100644
--- a/README.md
+++ b/README.md
@@ -46,7 +46,7 @@ https://github.com/nodegui/examples
 -   🕵️‍♂️ Good Devtools support.
 -   📚 Good documentation and website.
 -   🧙‍♂️ Good documentation for contributors.
--   🦹🏻‍♀️ Good support for dark mode (Thanks to QT).
+-   🦹🏻‍♀️ Good support for dark mode (Thanks to Qt).
 -   🏅First class Typescript support. (Works on regular JS projects too 😉).
 
 ## Getting Started
diff --git a/package-lock.json b/package-lock.json
index 4079bf3b7..fa6cfe9d6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -27,22 +27,23 @@
             }
         },
         "@babel/core": {
-            "version": "7.8.7",
-            "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.8.7.tgz",
-            "integrity": "sha512-rBlqF3Yko9cynC5CCFy6+K/w2N+Sq/ff2BPy+Krp7rHlABIr5epbA7OxVeKoMHB39LZOp1UY5SuLjy6uWi35yA==",
+            "version": "7.9.0",
+            "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.0.tgz",
+            "integrity": "sha512-kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w==",
             "dev": true,
             "requires": {
                 "@babel/code-frame": "^7.8.3",
-                "@babel/generator": "^7.8.7",
-                "@babel/helpers": "^7.8.4",
-                "@babel/parser": "^7.8.7",
+                "@babel/generator": "^7.9.0",
+                "@babel/helper-module-transforms": "^7.9.0",
+                "@babel/helpers": "^7.9.0",
+                "@babel/parser": "^7.9.0",
                 "@babel/template": "^7.8.6",
-                "@babel/traverse": "^7.8.6",
-                "@babel/types": "^7.8.7",
+                "@babel/traverse": "^7.9.0",
+                "@babel/types": "^7.9.0",
                 "convert-source-map": "^1.7.0",
                 "debug": "^4.1.0",
                 "gensync": "^1.0.0-beta.1",
-                "json5": "^2.1.0",
+                "json5": "^2.1.2",
                 "lodash": "^4.17.13",
                 "resolve": "^1.3.2",
                 "semver": "^5.4.1",
@@ -59,13 +60,13 @@
                     }
                 },
                 "@babel/highlight": {
-                    "version": "7.8.3",
-                    "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.8.3.tgz",
-                    "integrity": "sha512-PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg==",
+                    "version": "7.9.0",
+                    "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz",
+                    "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==",
                     "dev": true,
                     "requires": {
+                        "@babel/helper-validator-identifier": "^7.9.0",
                         "chalk": "^2.0.0",
-                        "esutils": "^2.0.2",
                         "js-tokens": "^4.0.0"
                     }
                 },
@@ -78,6 +79,21 @@
                         "ms": "^2.1.1"
                     }
                 },
+                "json5": {
+                    "version": "2.1.2",
+                    "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.2.tgz",
+                    "integrity": "sha512-MoUOQ4WdiN3yxhm7NEVJSJrieAo5hNSLQ5sj05OTRHPL9HOBy8u4Bu88jsC1jvqAdN+E1bJmsUcZH+1HQxliqQ==",
+                    "dev": true,
+                    "requires": {
+                        "minimist": "^1.2.5"
+                    }
+                },
+                "minimist": {
+                    "version": "1.2.5",
+                    "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+                    "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
+                    "dev": true
+                },
                 "ms": {
                     "version": "2.1.2",
                     "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
@@ -99,12 +115,12 @@
             }
         },
         "@babel/generator": {
-            "version": "7.8.7",
-            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.8.7.tgz",
-            "integrity": "sha512-DQwjiKJqH4C3qGiyQCAExJHoZssn49JTMJgZ8SANGgVFdkupcUhLOdkAeoC6kmHZCPfoDG5M0b6cFlSN5wW7Ew==",
+            "version": "7.9.4",
+            "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.4.tgz",
+            "integrity": "sha512-rjP8ahaDy/ouhrvCoU1E5mqaitWrxwuNGU+dy1EpaoK48jZay4MdkskKGIMHLZNewg8sAsqpGSREJwP0zH3YQA==",
             "dev": true,
             "requires": {
-                "@babel/types": "^7.8.7",
+                "@babel/types": "^7.9.0",
                 "jsesc": "^2.5.1",
                 "lodash": "^4.17.13",
                 "source-map": "^0.5.0"
@@ -138,12 +154,76 @@
                 "@babel/types": "^7.8.3"
             }
         },
+        "@babel/helper-member-expression-to-functions": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.8.3.tgz",
+            "integrity": "sha512-fO4Egq88utkQFjbPrSHGmGLFqmrshs11d46WI+WZDESt7Wu7wN2G2Iu+NMMZJFDOVRHAMIkB5SNh30NtwCA7RA==",
+            "dev": true,
+            "requires": {
+                "@babel/types": "^7.8.3"
+            }
+        },
+        "@babel/helper-module-imports": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz",
+            "integrity": "sha512-R0Bx3jippsbAEtzkpZ/6FIiuzOURPcMjHp+Z6xPe6DtApDJx+w7UYyOLanZqO8+wKR9G10s/FmHXvxaMd9s6Kg==",
+            "dev": true,
+            "requires": {
+                "@babel/types": "^7.8.3"
+            }
+        },
+        "@babel/helper-module-transforms": {
+            "version": "7.9.0",
+            "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.9.0.tgz",
+            "integrity": "sha512-0FvKyu0gpPfIQ8EkxlrAydOWROdHpBmiCiRwLkUiBGhCUPRRbVD2/tm3sFr/c/GWFrQ/ffutGUAnx7V0FzT2wA==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-module-imports": "^7.8.3",
+                "@babel/helper-replace-supers": "^7.8.6",
+                "@babel/helper-simple-access": "^7.8.3",
+                "@babel/helper-split-export-declaration": "^7.8.3",
+                "@babel/template": "^7.8.6",
+                "@babel/types": "^7.9.0",
+                "lodash": "^4.17.13"
+            }
+        },
+        "@babel/helper-optimise-call-expression": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.8.3.tgz",
+            "integrity": "sha512-Kag20n86cbO2AvHca6EJsvqAd82gc6VMGule4HwebwMlwkpXuVqrNRj6CkCV2sKxgi9MyAUnZVnZ6lJ1/vKhHQ==",
+            "dev": true,
+            "requires": {
+                "@babel/types": "^7.8.3"
+            }
+        },
         "@babel/helper-plugin-utils": {
             "version": "7.8.3",
             "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz",
             "integrity": "sha512-j+fq49Xds2smCUNYmEHF9kGNkhbet6yVIBp4e6oeQpH1RUs/Ir06xUKzDjDkGcaaokPiTNs2JBWHjaE4csUkZQ==",
             "dev": true
         },
+        "@babel/helper-replace-supers": {
+            "version": "7.8.6",
+            "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.8.6.tgz",
+            "integrity": "sha512-PeMArdA4Sv/Wf4zXwBKPqVj7n9UF/xg6slNRtZW84FM7JpE1CbG8B612FyM4cxrf4fMAMGO0kR7voy1ForHHFA==",
+            "dev": true,
+            "requires": {
+                "@babel/helper-member-expression-to-functions": "^7.8.3",
+                "@babel/helper-optimise-call-expression": "^7.8.3",
+                "@babel/traverse": "^7.8.6",
+                "@babel/types": "^7.8.6"
+            }
+        },
+        "@babel/helper-simple-access": {
+            "version": "7.8.3",
+            "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.8.3.tgz",
+            "integrity": "sha512-VNGUDjx5cCWg4vvCTR8qQ7YJYZ+HBjxOgXEl7ounz+4Sn7+LMD3CFrCTEU6/qXKbA2nKg21CwhhBzO0RpRbdCw==",
+            "dev": true,
+            "requires": {
+                "@babel/template": "^7.8.3",
+                "@babel/types": "^7.8.3"
+            }
+        },
         "@babel/helper-split-export-declaration": {
             "version": "7.8.3",
             "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz",
@@ -153,15 +233,21 @@
                 "@babel/types": "^7.8.3"
             }
         },
+        "@babel/helper-validator-identifier": {
+            "version": "7.9.0",
+            "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.0.tgz",
+            "integrity": "sha512-6G8bQKjOh+of4PV/ThDm/rRqlU7+IGoJuofpagU5GlEl29Vv0RGqqt86ZGRV8ZuSOY3o+8yXl5y782SMcG7SHw==",
+            "dev": true
+        },
         "@babel/helpers": {
-            "version": "7.8.4",
-            "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.8.4.tgz",
-            "integrity": "sha512-VPbe7wcQ4chu4TDQjimHv/5tj73qz88o12EPkO2ValS2QiQS/1F2SsjyIGNnAD0vF/nZS6Cf9i+vW6HIlnaR8w==",
+            "version": "7.9.2",
+            "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.9.2.tgz",
+            "integrity": "sha512-JwLvzlXVPjO8eU9c/wF9/zOIN7X6h8DYf7mG4CiFRZRvZNKEF5dQ3H3V+ASkHoIB3mWhatgl5ONhyqHRI6MppA==",
             "dev": true,
             "requires": {
                 "@babel/template": "^7.8.3",
-                "@babel/traverse": "^7.8.4",
-                "@babel/types": "^7.8.3"
+                "@babel/traverse": "^7.9.0",
+                "@babel/types": "^7.9.0"
             }
         },
         "@babel/highlight": {
@@ -176,9 +262,9 @@
             }
         },
         "@babel/parser": {
-            "version": "7.8.7",
-            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.8.7.tgz",
-            "integrity": "sha512-9JWls8WilDXFGxs0phaXAZgpxTZhSk/yOYH2hTHC0X1yC7Z78IJfvR1vJ+rmJKq3I35td2XzXzN6ZLYlna+r/A==",
+            "version": "7.9.4",
+            "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.4.tgz",
+            "integrity": "sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==",
             "dev": true
         },
         "@babel/plugin-syntax-bigint": {
@@ -229,30 +315,30 @@
                     }
                 },
                 "@babel/highlight": {
-                    "version": "7.8.3",
-                    "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.8.3.tgz",
-                    "integrity": "sha512-PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg==",
+                    "version": "7.9.0",
+                    "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz",
+                    "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==",
                     "dev": true,
                     "requires": {
+                        "@babel/helper-validator-identifier": "^7.9.0",
                         "chalk": "^2.0.0",
-                        "esutils": "^2.0.2",
                         "js-tokens": "^4.0.0"
                     }
                 }
             }
         },
         "@babel/traverse": {
-            "version": "7.8.6",
-            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.8.6.tgz",
-            "integrity": "sha512-2B8l0db/DPi8iinITKuo7cbPznLCEk0kCxDoB9/N6gGNg/gxOXiR/IcymAFPiBwk5w6TtQ27w4wpElgp9btR9A==",
+            "version": "7.9.0",
+            "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.0.tgz",
+            "integrity": "sha512-jAZQj0+kn4WTHO5dUZkZKhbFrqZE7K5LAQ5JysMnmvGij+wOdr+8lWqPeW0BcF4wFwrEXXtdGO7wcV6YPJcf3w==",
             "dev": true,
             "requires": {
                 "@babel/code-frame": "^7.8.3",
-                "@babel/generator": "^7.8.6",
+                "@babel/generator": "^7.9.0",
                 "@babel/helper-function-name": "^7.8.3",
                 "@babel/helper-split-export-declaration": "^7.8.3",
-                "@babel/parser": "^7.8.6",
-                "@babel/types": "^7.8.6",
+                "@babel/parser": "^7.9.0",
+                "@babel/types": "^7.9.0",
                 "debug": "^4.1.0",
                 "globals": "^11.1.0",
                 "lodash": "^4.17.13"
@@ -268,13 +354,13 @@
                     }
                 },
                 "@babel/highlight": {
-                    "version": "7.8.3",
-                    "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.8.3.tgz",
-                    "integrity": "sha512-PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg==",
+                    "version": "7.9.0",
+                    "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz",
+                    "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==",
                     "dev": true,
                     "requires": {
+                        "@babel/helper-validator-identifier": "^7.9.0",
                         "chalk": "^2.0.0",
-                        "esutils": "^2.0.2",
                         "js-tokens": "^4.0.0"
                     }
                 },
@@ -296,12 +382,12 @@
             }
         },
         "@babel/types": {
-            "version": "7.8.7",
-            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.7.tgz",
-            "integrity": "sha512-k2TreEHxFA4CjGkL+GYjRyx35W0Mr7DP5+9q6WMkyKXB+904bYmG40syjMFV0oLlhhFCwWl0vA0DyzTDkwAiJw==",
+            "version": "7.9.0",
+            "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.0.tgz",
+            "integrity": "sha512-BS9JKfXkzzJl8RluW4JGknzpiUV7ZrvTayM6yfqLTVBEnFtyowVIOu6rqxRd5cVO6yGoWf4T8u8dgK9oB+GCng==",
             "dev": true,
             "requires": {
-                "esutils": "^2.0.2",
+                "@babel/helper-validator-identifier": "^7.9.0",
                 "lodash": "^4.17.13",
                 "to-fast-properties": "^2.0.0"
             }
@@ -323,9 +409,9 @@
             },
             "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==",
                     "dev": true
                 }
             }
@@ -357,14 +443,14 @@
             "dev": true
         },
         "@jest/console": {
-            "version": "25.1.0",
-            "resolved": "https://registry.npmjs.org/@jest/console/-/console-25.1.0.tgz",
-            "integrity": "sha512-3P1DpqAMK/L07ag/Y9/Jup5iDEG9P4pRAuZiMQnU0JB3UOvCyYCjCoxr7sIA80SeyUCUKrr24fKAxVpmBgQonA==",
+            "version": "25.2.3",
+            "resolved": "https://registry.npmjs.org/@jest/console/-/console-25.2.3.tgz",
+            "integrity": "sha512-k+37B1aSvOt9tKHWbZZSOy1jdgzesB0bj96igCVUG1nAH1W5EoUfgc5EXbBVU08KSLvkVdWopLXaO3xfVGlxtQ==",
             "dev": true,
             "requires": {
-                "@jest/source-map": "^25.1.0",
+                "@jest/source-map": "^25.2.1",
                 "chalk": "^3.0.0",
-                "jest-util": "^25.1.0",
+                "jest-util": "^25.2.3",
                 "slash": "^3.0.0"
             },
             "dependencies": {
@@ -421,41 +507,53 @@
             }
         },
         "@jest/core": {
-            "version": "25.1.0",
-            "resolved": "https://registry.npmjs.org/@jest/core/-/core-25.1.0.tgz",
-            "integrity": "sha512-iz05+NmwCmZRzMXvMo6KFipW7nzhbpEawrKrkkdJzgytavPse0biEnCNr2wRlyCsp3SmKaEY+SGv7YWYQnIdig==",
+            "version": "25.2.4",
+            "resolved": "https://registry.npmjs.org/@jest/core/-/core-25.2.4.tgz",
+            "integrity": "sha512-WcWYShl0Bqfcb32oXtjwbiR78D/djhMdJW+ulp4/bmHgeODcsieqUJfUH+kEv8M7VNV77E6jds5aA+WuGh1nmg==",
             "dev": true,
             "requires": {
-                "@jest/console": "^25.1.0",
-                "@jest/reporters": "^25.1.0",
-                "@jest/test-result": "^25.1.0",
-                "@jest/transform": "^25.1.0",
-                "@jest/types": "^25.1.0",
+                "@jest/console": "^25.2.3",
+                "@jest/reporters": "^25.2.4",
+                "@jest/test-result": "^25.2.4",
+                "@jest/transform": "^25.2.4",
+                "@jest/types": "^25.2.3",
                 "ansi-escapes": "^4.2.1",
                 "chalk": "^3.0.0",
                 "exit": "^0.1.2",
                 "graceful-fs": "^4.2.3",
-                "jest-changed-files": "^25.1.0",
-                "jest-config": "^25.1.0",
-                "jest-haste-map": "^25.1.0",
-                "jest-message-util": "^25.1.0",
-                "jest-regex-util": "^25.1.0",
-                "jest-resolve": "^25.1.0",
-                "jest-resolve-dependencies": "^25.1.0",
-                "jest-runner": "^25.1.0",
-                "jest-runtime": "^25.1.0",
-                "jest-snapshot": "^25.1.0",
-                "jest-util": "^25.1.0",
-                "jest-validate": "^25.1.0",
-                "jest-watcher": "^25.1.0",
+                "jest-changed-files": "^25.2.3",
+                "jest-config": "^25.2.4",
+                "jest-haste-map": "^25.2.3",
+                "jest-message-util": "^25.2.4",
+                "jest-regex-util": "^25.2.1",
+                "jest-resolve": "^25.2.3",
+                "jest-resolve-dependencies": "^25.2.4",
+                "jest-runner": "^25.2.4",
+                "jest-runtime": "^25.2.4",
+                "jest-snapshot": "^25.2.4",
+                "jest-util": "^25.2.3",
+                "jest-validate": "^25.2.3",
+                "jest-watcher": "^25.2.4",
                 "micromatch": "^4.0.2",
                 "p-each-series": "^2.1.0",
-                "realpath-native": "^1.1.0",
+                "realpath-native": "^2.0.0",
                 "rimraf": "^3.0.0",
                 "slash": "^3.0.0",
                 "strip-ansi": "^6.0.0"
             },
             "dependencies": {
+                "@jest/types": {
+                    "version": "25.2.3",
+                    "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.2.3.tgz",
+                    "integrity": "sha512-6oLQwO9mKif3Uph3RX5J1i3S7X7xtDHWBaaaoeKw8hOzV6YUd0qDcYcHZ6QXMHDIzSr7zzrEa51o2Ovlj6AtKQ==",
+                    "dev": true,
+                    "requires": {
+                        "@types/istanbul-lib-coverage": "^2.0.0",
+                        "@types/istanbul-reports": "^1.1.1",
+                        "@types/yargs": "^15.0.0",
+                        "chalk": "^3.0.0"
+                    }
+                },
                 "ansi-regex": {
                     "version": "5.0.0",
                     "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
@@ -539,41 +637,168 @@
             }
         },
         "@jest/environment": {
-            "version": "25.1.0",
-            "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-25.1.0.tgz",
-            "integrity": "sha512-cTpUtsjU4cum53VqBDlcW0E4KbQF03Cn0jckGPW/5rrE9tb+porD3+hhLtHAwhthsqfyF+bizyodTlsRA++sHg==",
+            "version": "25.2.4",
+            "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-25.2.4.tgz",
+            "integrity": "sha512-wA4xlhD19/gukkDpJ5HQsTle0pgnzI5qMFEjw267lpTDC8d9N7Ihqr5pI+l0p8Qn1SQhai+glSqxrGdzKy4jxw==",
             "dev": true,
             "requires": {
-                "@jest/fake-timers": "^25.1.0",
-                "@jest/types": "^25.1.0",
-                "jest-mock": "^25.1.0"
+                "@jest/fake-timers": "^25.2.4",
+                "@jest/types": "^25.2.3",
+                "jest-mock": "^25.2.3"
+            },
+            "dependencies": {
+                "@jest/types": {
+                    "version": "25.2.3",
+                    "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.2.3.tgz",
+                    "integrity": "sha512-6oLQwO9mKif3Uph3RX5J1i3S7X7xtDHWBaaaoeKw8hOzV6YUd0qDcYcHZ6QXMHDIzSr7zzrEa51o2Ovlj6AtKQ==",
+                    "dev": true,
+                    "requires": {
+                        "@types/istanbul-lib-coverage": "^2.0.0",
+                        "@types/istanbul-reports": "^1.1.1",
+                        "@types/yargs": "^15.0.0",
+                        "chalk": "^3.0.0"
+                    }
+                },
+                "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==",
+                    "dev": true,
+                    "requires": {
+                        "@types/color-name": "^1.1.1",
+                        "color-convert": "^2.0.1"
+                    }
+                },
+                "chalk": {
+                    "version": "3.0.0",
+                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+                    "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+                    "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.1.0",
+                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+                    "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+                    "dev": true,
+                    "requires": {
+                        "has-flag": "^4.0.0"
+                    }
+                }
             }
         },
         "@jest/fake-timers": {
-            "version": "25.1.0",
-            "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-25.1.0.tgz",
-            "integrity": "sha512-Eu3dysBzSAO1lD7cylZd/CVKdZZ1/43SF35iYBNV1Lvvn2Undp3Grwsv8PrzvbLhqwRzDd4zxrY4gsiHc+wygQ==",
+            "version": "25.2.4",
+            "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-25.2.4.tgz",
+            "integrity": "sha512-oC1TJiwfMcBttVN7Wz+VZnqEAgYTiEMu0QLOXpypR89nab0uCB31zm/QeBZddhSstn20qe3yqOXygp6OwvKT/Q==",
             "dev": true,
             "requires": {
-                "@jest/types": "^25.1.0",
-                "jest-message-util": "^25.1.0",
-                "jest-mock": "^25.1.0",
-                "jest-util": "^25.1.0",
+                "@jest/types": "^25.2.3",
+                "jest-message-util": "^25.2.4",
+                "jest-mock": "^25.2.3",
+                "jest-util": "^25.2.3",
                 "lolex": "^5.0.0"
+            },
+            "dependencies": {
+                "@jest/types": {
+                    "version": "25.2.3",
+                    "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.2.3.tgz",
+                    "integrity": "sha512-6oLQwO9mKif3Uph3RX5J1i3S7X7xtDHWBaaaoeKw8hOzV6YUd0qDcYcHZ6QXMHDIzSr7zzrEa51o2Ovlj6AtKQ==",
+                    "dev": true,
+                    "requires": {
+                        "@types/istanbul-lib-coverage": "^2.0.0",
+                        "@types/istanbul-reports": "^1.1.1",
+                        "@types/yargs": "^15.0.0",
+                        "chalk": "^3.0.0"
+                    }
+                },
+                "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==",
+                    "dev": true,
+                    "requires": {
+                        "@types/color-name": "^1.1.1",
+                        "color-convert": "^2.0.1"
+                    }
+                },
+                "chalk": {
+                    "version": "3.0.0",
+                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+                    "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+                    "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.1.0",
+                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+                    "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+                    "dev": true,
+                    "requires": {
+                        "has-flag": "^4.0.0"
+                    }
+                }
             }
         },
         "@jest/reporters": {
-            "version": "25.1.0",
-            "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-25.1.0.tgz",
-            "integrity": "sha512-ORLT7hq2acJQa8N+NKfs68ZtHFnJPxsGqmofxW7v7urVhzJvpKZG9M7FAcgh9Ee1ZbCteMrirHA3m5JfBtAaDg==",
+            "version": "25.2.4",
+            "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-25.2.4.tgz",
+            "integrity": "sha512-VHbLxM03jCc+bTLOluW/IqHR2G0Cl0iATwIQbuZtIUast8IXO4fD0oy4jpVGpG5b20S6REA8U3BaQoCW/CeVNQ==",
             "dev": true,
             "requires": {
                 "@bcoe/v8-coverage": "^0.2.3",
-                "@jest/console": "^25.1.0",
-                "@jest/environment": "^25.1.0",
-                "@jest/test-result": "^25.1.0",
-                "@jest/transform": "^25.1.0",
-                "@jest/types": "^25.1.0",
+                "@jest/console": "^25.2.3",
+                "@jest/test-result": "^25.2.4",
+                "@jest/transform": "^25.2.4",
+                "@jest/types": "^25.2.3",
                 "chalk": "^3.0.0",
                 "collect-v8-coverage": "^1.0.0",
                 "exit": "^0.1.2",
@@ -583,11 +808,10 @@
                 "istanbul-lib-report": "^3.0.0",
                 "istanbul-lib-source-maps": "^4.0.0",
                 "istanbul-reports": "^3.0.0",
-                "jest-haste-map": "^25.1.0",
-                "jest-resolve": "^25.1.0",
-                "jest-runtime": "^25.1.0",
-                "jest-util": "^25.1.0",
-                "jest-worker": "^25.1.0",
+                "jest-haste-map": "^25.2.3",
+                "jest-resolve": "^25.2.3",
+                "jest-util": "^25.2.3",
+                "jest-worker": "^25.2.1",
                 "node-notifier": "^6.0.0",
                 "slash": "^3.0.0",
                 "source-map": "^0.6.0",
@@ -596,6 +820,18 @@
                 "v8-to-istanbul": "^4.0.1"
             },
             "dependencies": {
+                "@jest/types": {
+                    "version": "25.2.3",
+                    "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.2.3.tgz",
+                    "integrity": "sha512-6oLQwO9mKif3Uph3RX5J1i3S7X7xtDHWBaaaoeKw8hOzV6YUd0qDcYcHZ6QXMHDIzSr7zzrEa51o2Ovlj6AtKQ==",
+                    "dev": true,
+                    "requires": {
+                        "@types/istanbul-lib-coverage": "^2.0.0",
+                        "@types/istanbul-reports": "^1.1.1",
+                        "@types/yargs": "^15.0.0",
+                        "chalk": "^3.0.0"
+                    }
+                },
                 "ansi-styles": {
                     "version": "4.2.1",
                     "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
@@ -649,9 +885,9 @@
             }
         },
         "@jest/source-map": {
-            "version": "25.1.0",
-            "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-25.1.0.tgz",
-            "integrity": "sha512-ohf2iKT0xnLWcIUhL6U6QN+CwFWf9XnrM2a6ybL9NXxJjgYijjLSitkYHIdzkd8wFliH73qj/+epIpTiWjRtAA==",
+            "version": "25.2.1",
+            "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-25.2.1.tgz",
+            "integrity": "sha512-PgScGJm1U27+9Te/cxP4oUFqJ2PX6NhBL2a6unQ7yafCgs8k02c0LSyjSIx/ao0AwcAdCczfAPDf5lJ7zoB/7A==",
             "dev": true,
             "requires": {
                 "callsites": "^3.0.0",
@@ -668,54 +904,130 @@
             }
         },
         "@jest/test-result": {
-            "version": "25.1.0",
-            "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-25.1.0.tgz",
-            "integrity": "sha512-FZzSo36h++U93vNWZ0KgvlNuZ9pnDnztvaM7P/UcTx87aPDotG18bXifkf1Ji44B7k/eIatmMzkBapnAzjkJkg==",
+            "version": "25.2.4",
+            "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-25.2.4.tgz",
+            "integrity": "sha512-AI7eUy+q2lVhFnaibDFg68NGkrxVWZdD6KBr9Hm6EvN0oAe7GxpEwEavgPfNHQjU2mi6g+NsFn/6QPgTUwM1qg==",
             "dev": true,
             "requires": {
-                "@jest/console": "^25.1.0",
-                "@jest/transform": "^25.1.0",
-                "@jest/types": "^25.1.0",
+                "@jest/console": "^25.2.3",
+                "@jest/transform": "^25.2.4",
+                "@jest/types": "^25.2.3",
                 "@types/istanbul-lib-coverage": "^2.0.0",
                 "collect-v8-coverage": "^1.0.0"
+            },
+            "dependencies": {
+                "@jest/types": {
+                    "version": "25.2.3",
+                    "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.2.3.tgz",
+                    "integrity": "sha512-6oLQwO9mKif3Uph3RX5J1i3S7X7xtDHWBaaaoeKw8hOzV6YUd0qDcYcHZ6QXMHDIzSr7zzrEa51o2Ovlj6AtKQ==",
+                    "dev": true,
+                    "requires": {
+                        "@types/istanbul-lib-coverage": "^2.0.0",
+                        "@types/istanbul-reports": "^1.1.1",
+                        "@types/yargs": "^15.0.0",
+                        "chalk": "^3.0.0"
+                    }
+                },
+                "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==",
+                    "dev": true,
+                    "requires": {
+                        "@types/color-name": "^1.1.1",
+                        "color-convert": "^2.0.1"
+                    }
+                },
+                "chalk": {
+                    "version": "3.0.0",
+                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+                    "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+                    "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.1.0",
+                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+                    "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+                    "dev": true,
+                    "requires": {
+                        "has-flag": "^4.0.0"
+                    }
+                }
             }
         },
         "@jest/test-sequencer": {
-            "version": "25.1.0",
-            "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-25.1.0.tgz",
-            "integrity": "sha512-WgZLRgVr2b4l/7ED1J1RJQBOharxS11EFhmwDqknpknE0Pm87HLZVS2Asuuw+HQdfQvm2aXL2FvvBLxOD1D0iw==",
+            "version": "25.2.4",
+            "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-25.2.4.tgz",
+            "integrity": "sha512-TEZm/Rkd6YgskdpTJdYLBtu6Gc11tfWPuSpatq0duH77ekjU8dpqX2zkPdY/ayuHxztV5LTJoV5BLtI9mZfXew==",
             "dev": true,
             "requires": {
-                "@jest/test-result": "^25.1.0",
-                "jest-haste-map": "^25.1.0",
-                "jest-runner": "^25.1.0",
-                "jest-runtime": "^25.1.0"
+                "@jest/test-result": "^25.2.4",
+                "jest-haste-map": "^25.2.3",
+                "jest-runner": "^25.2.4",
+                "jest-runtime": "^25.2.4"
             }
         },
         "@jest/transform": {
-            "version": "25.1.0",
-            "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-25.1.0.tgz",
-            "integrity": "sha512-4ktrQ2TPREVeM+KxB4zskAT84SnmG1vaz4S+51aTefyqn3zocZUnliLLm5Fsl85I3p/kFPN4CRp1RElIfXGegQ==",
+            "version": "25.2.4",
+            "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-25.2.4.tgz",
+            "integrity": "sha512-6eRigvb+G6bs4kW5j1/y8wu4nCrmVuIe0epPBbiWaYlwawJ8yi1EIyK3d/btDqmBpN5GpN4YhR6iPPnDmkYdTA==",
             "dev": true,
             "requires": {
                 "@babel/core": "^7.1.0",
-                "@jest/types": "^25.1.0",
+                "@jest/types": "^25.2.3",
                 "babel-plugin-istanbul": "^6.0.0",
                 "chalk": "^3.0.0",
                 "convert-source-map": "^1.4.0",
                 "fast-json-stable-stringify": "^2.0.0",
                 "graceful-fs": "^4.2.3",
-                "jest-haste-map": "^25.1.0",
-                "jest-regex-util": "^25.1.0",
-                "jest-util": "^25.1.0",
+                "jest-haste-map": "^25.2.3",
+                "jest-regex-util": "^25.2.1",
+                "jest-util": "^25.2.3",
                 "micromatch": "^4.0.2",
                 "pirates": "^4.0.1",
-                "realpath-native": "^1.1.0",
+                "realpath-native": "^2.0.0",
                 "slash": "^3.0.0",
                 "source-map": "^0.6.1",
                 "write-file-atomic": "^3.0.0"
             },
             "dependencies": {
+                "@jest/types": {
+                    "version": "25.2.3",
+                    "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.2.3.tgz",
+                    "integrity": "sha512-6oLQwO9mKif3Uph3RX5J1i3S7X7xtDHWBaaaoeKw8hOzV6YUd0qDcYcHZ6QXMHDIzSr7zzrEa51o2Ovlj6AtKQ==",
+                    "dev": true,
+                    "requires": {
+                        "@types/istanbul-lib-coverage": "^2.0.0",
+                        "@types/istanbul-reports": "^1.1.1",
+                        "@types/yargs": "^15.0.0",
+                        "chalk": "^3.0.0"
+                    }
+                },
                 "ansi-styles": {
                     "version": "4.2.1",
                     "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
@@ -1035,9 +1347,9 @@
             "dev": true
         },
         "@types/node": {
-            "version": "13.9.3",
-            "resolved": "https://registry.npmjs.org/@types/node/-/node-13.9.3.tgz",
-            "integrity": "sha512-01s+ac4qerwd6RHD+mVbOEsraDHSgUaefQlEdBbUolnQFjKwCr7luvAlEwW1RFojh67u0z4OUTjPn9LEl4zIkA==",
+            "version": "13.9.5",
+            "resolved": "https://registry.npmjs.org/@types/node/-/node-13.9.5.tgz",
+            "integrity": "sha512-hkzMMD3xu6BrJpGVLeQ3htQQNAcOrJjX7WFmtK8zWQpz2UJf13LCFF2ALA7c9OVdvc2vQJeDdjfR35M0sBCxvw==",
             "dev": true
         },
         "@types/parse-json": {
@@ -1046,6 +1358,12 @@
             "integrity": "sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA==",
             "dev": true
         },
+        "@types/prettier": {
+            "version": "1.19.1",
+            "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-1.19.1.tgz",
+            "integrity": "sha512-5qOlnZscTn4xxM5MeGXAMOsIOIKIbh9e85zJWfBRVPlRMEVawzoPhINYbRGkBZCI8LxvBe7tJCdWiarA99OZfQ==",
+            "dev": true
+        },
         "@types/stack-utils": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-1.0.1.tgz",
@@ -1068,33 +1386,33 @@
             "dev": true
         },
         "@typescript-eslint/eslint-plugin": {
-            "version": "2.24.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.24.0.tgz",
-            "integrity": "sha512-wJRBeaMeT7RLQ27UQkDFOu25MqFOBus8PtOa9KaT5ZuxC1kAsd7JEHqWt4YXuY9eancX0GK9C68i5OROnlIzBA==",
+            "version": "2.26.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.26.0.tgz",
+            "integrity": "sha512-4yUnLv40bzfzsXcTAtZyTjbiGUXMrcIJcIMioI22tSOyAxpdXiZ4r7YQUU8Jj6XXrLz9d5aMHPQf5JFR7h27Nw==",
             "dev": true,
             "requires": {
-                "@typescript-eslint/experimental-utils": "2.24.0",
-                "eslint-utils": "^1.4.3",
+                "@typescript-eslint/experimental-utils": "2.26.0",
                 "functional-red-black-tree": "^1.0.1",
                 "regexpp": "^3.0.0",
                 "tsutils": "^3.17.1"
             },
             "dependencies": {
                 "@typescript-eslint/experimental-utils": {
-                    "version": "2.24.0",
-                    "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.24.0.tgz",
-                    "integrity": "sha512-DXrwuXTdVh3ycNCMYmWhUzn/gfqu9N0VzNnahjiDJvcyhfBy4gb59ncVZVxdp5XzBC77dCncu0daQgOkbvPwBw==",
+                    "version": "2.26.0",
+                    "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.26.0.tgz",
+                    "integrity": "sha512-RELVoH5EYd+JlGprEyojUv9HeKcZqF7nZUGSblyAw1FwOGNnmQIU8kxJ69fttQvEwCsX5D6ECJT8GTozxrDKVQ==",
                     "dev": true,
                     "requires": {
                         "@types/json-schema": "^7.0.3",
-                        "@typescript-eslint/typescript-estree": "2.24.0",
-                        "eslint-scope": "^5.0.0"
+                        "@typescript-eslint/typescript-estree": "2.26.0",
+                        "eslint-scope": "^5.0.0",
+                        "eslint-utils": "^2.0.0"
                     }
                 },
                 "@typescript-eslint/typescript-estree": {
-                    "version": "2.24.0",
-                    "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.24.0.tgz",
-                    "integrity": "sha512-RJ0yMe5owMSix55qX7Mi9V6z2FDuuDpN6eR5fzRJrp+8in9UF41IGNQHbg5aMK4/PjVaEQksLvz0IA8n+Mr/FA==",
+                    "version": "2.26.0",
+                    "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.26.0.tgz",
+                    "integrity": "sha512-3x4SyZCLB4zsKsjuhxDLeVJN6W29VwBnYpCsZ7vIdPel9ZqLfIZJgJXO47MNUkurGpQuIBALdPQKtsSnWpE1Yg==",
                     "dev": true,
                     "requires": {
                         "debug": "^4.1.1",
@@ -1115,6 +1433,15 @@
                         "ms": "^2.1.1"
                     }
                 },
+                "eslint-utils": {
+                    "version": "2.0.0",
+                    "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.0.0.tgz",
+                    "integrity": "sha512-0HCPuJv+7Wv1bACm8y5/ECVfYdfsAm9xmVb7saeFlxjPYALefjhbYoCkBjPdPzGH8wWyTpAez82Fh3VKYEZ8OA==",
+                    "dev": true,
+                    "requires": {
+                        "eslint-visitor-keys": "^1.1.0"
+                    }
+                },
                 "glob": {
                     "version": "7.1.6",
                     "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
@@ -1149,44 +1476,56 @@
                 }
             }
         },
+        "@typescript-eslint/experimental-utils": {
+            "version": "2.25.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.25.0.tgz",
+            "integrity": "sha512-0IZ4ZR5QkFYbaJk+8eJ2kYeA+1tzOE1sBjbwwtSV85oNWYUBep+EyhlZ7DLUCyhMUGuJpcCCFL0fDtYAP1zMZw==",
+            "dev": true,
+            "requires": {
+                "@types/json-schema": "^7.0.3",
+                "@typescript-eslint/typescript-estree": "2.25.0",
+                "eslint-scope": "^5.0.0",
+                "eslint-utils": "^2.0.0"
+            },
+            "dependencies": {
+                "eslint-utils": {
+                    "version": "2.0.0",
+                    "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.0.0.tgz",
+                    "integrity": "sha512-0HCPuJv+7Wv1bACm8y5/ECVfYdfsAm9xmVb7saeFlxjPYALefjhbYoCkBjPdPzGH8wWyTpAez82Fh3VKYEZ8OA==",
+                    "dev": true,
+                    "requires": {
+                        "eslint-visitor-keys": "^1.1.0"
+                    }
+                }
+            }
+        },
         "@typescript-eslint/parser": {
-            "version": "2.24.0",
-            "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.24.0.tgz",
-            "integrity": "sha512-H2Y7uacwSSg8IbVxdYExSI3T7uM1DzmOn2COGtCahCC3g8YtM1xYAPi2MAHyfPs61VKxP/J/UiSctcRgw4G8aw==",
+            "version": "2.25.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.25.0.tgz",
+            "integrity": "sha512-mccBLaBSpNVgp191CP5W+8U1crTyXsRziWliCqzj02kpxdjKMvFHGJbK33NroquH3zB/gZ8H511HEsJBa2fNEg==",
             "dev": true,
             "requires": {
                 "@types/eslint-visitor-keys": "^1.0.0",
-                "@typescript-eslint/experimental-utils": "2.24.0",
-                "@typescript-eslint/typescript-estree": "2.24.0",
+                "@typescript-eslint/experimental-utils": "2.25.0",
+                "@typescript-eslint/typescript-estree": "2.25.0",
                 "eslint-visitor-keys": "^1.1.0"
+            }
+        },
+        "@typescript-eslint/typescript-estree": {
+            "version": "2.25.0",
+            "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.25.0.tgz",
+            "integrity": "sha512-VUksmx5lDxSi6GfmwSK7SSoIKSw9anukWWNitQPqt58LuYrKalzsgeuignbqnB+rK/xxGlSsCy8lYnwFfB6YJg==",
+            "dev": true,
+            "requires": {
+                "debug": "^4.1.1",
+                "eslint-visitor-keys": "^1.1.0",
+                "glob": "^7.1.6",
+                "is-glob": "^4.0.1",
+                "lodash": "^4.17.15",
+                "semver": "^6.3.0",
+                "tsutils": "^3.17.1"
             },
             "dependencies": {
-                "@typescript-eslint/experimental-utils": {
-                    "version": "2.24.0",
-                    "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.24.0.tgz",
-                    "integrity": "sha512-DXrwuXTdVh3ycNCMYmWhUzn/gfqu9N0VzNnahjiDJvcyhfBy4gb59ncVZVxdp5XzBC77dCncu0daQgOkbvPwBw==",
-                    "dev": true,
-                    "requires": {
-                        "@types/json-schema": "^7.0.3",
-                        "@typescript-eslint/typescript-estree": "2.24.0",
-                        "eslint-scope": "^5.0.0"
-                    }
-                },
-                "@typescript-eslint/typescript-estree": {
-                    "version": "2.24.0",
-                    "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.24.0.tgz",
-                    "integrity": "sha512-RJ0yMe5owMSix55qX7Mi9V6z2FDuuDpN6eR5fzRJrp+8in9UF41IGNQHbg5aMK4/PjVaEQksLvz0IA8n+Mr/FA==",
-                    "dev": true,
-                    "requires": {
-                        "debug": "^4.1.1",
-                        "eslint-visitor-keys": "^1.1.0",
-                        "glob": "^7.1.6",
-                        "is-glob": "^4.0.1",
-                        "lodash": "^4.17.15",
-                        "semver": "^6.3.0",
-                        "tsutils": "^3.17.1"
-                    }
-                },
                 "debug": {
                     "version": "4.1.1",
                     "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
@@ -1448,20 +1787,32 @@
             "integrity": "sha512-ReZxvNHIOv88FlT7rxcXIIC0fPt4KZqZbOlivyWtXLt8ESx84zd3kMC6iK5jVeS2qt+g7ftS7ye4fi06X5rtRQ=="
         },
         "babel-jest": {
-            "version": "25.1.0",
-            "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-25.1.0.tgz",
-            "integrity": "sha512-tz0VxUhhOE2y+g8R2oFrO/2VtVjA1lkJeavlhExuRBg3LdNJY9gwQ+Vcvqt9+cqy71MCTJhewvTB7Qtnnr9SWg==",
+            "version": "25.2.4",
+            "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-25.2.4.tgz",
+            "integrity": "sha512-+yDzlyJVWrqih9i2Cvjpt7COaN8vUwCsKGtxJLzg6I0xhxD54K8mvDUCliPKLufyzHh/c5C4MRj4Vk7VMjOjIg==",
             "dev": true,
             "requires": {
-                "@jest/transform": "^25.1.0",
-                "@jest/types": "^25.1.0",
+                "@jest/transform": "^25.2.4",
+                "@jest/types": "^25.2.3",
                 "@types/babel__core": "^7.1.0",
                 "babel-plugin-istanbul": "^6.0.0",
-                "babel-preset-jest": "^25.1.0",
+                "babel-preset-jest": "^25.2.1",
                 "chalk": "^3.0.0",
                 "slash": "^3.0.0"
             },
             "dependencies": {
+                "@jest/types": {
+                    "version": "25.2.3",
+                    "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.2.3.tgz",
+                    "integrity": "sha512-6oLQwO9mKif3Uph3RX5J1i3S7X7xtDHWBaaaoeKw8hOzV6YUd0qDcYcHZ6QXMHDIzSr7zzrEa51o2Ovlj6AtKQ==",
+                    "dev": true,
+                    "requires": {
+                        "@types/istanbul-lib-coverage": "^2.0.0",
+                        "@types/istanbul-reports": "^1.1.1",
+                        "@types/yargs": "^15.0.0",
+                        "chalk": "^3.0.0"
+                    }
+                },
                 "ansi-styles": {
                     "version": "4.2.1",
                     "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
@@ -1528,23 +1879,23 @@
             }
         },
         "babel-plugin-jest-hoist": {
-            "version": "25.1.0",
-            "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-25.1.0.tgz",
-            "integrity": "sha512-oIsopO41vW4YFZ9yNYoLQATnnN46lp+MZ6H4VvPKFkcc2/fkl3CfE/NZZSmnEIEsJRmJAgkVEK0R7Zbl50CpTw==",
+            "version": "25.2.1",
+            "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-25.2.1.tgz",
+            "integrity": "sha512-HysbCQfJhxLlyxDbKcB2ucGYV0LjqK4h6dBoI3RtFuOxTiTWK6XGZMsHb0tGh8iJdV4hC6Z2GCHzVvDeh9i0lQ==",
             "dev": true,
             "requires": {
                 "@types/babel__traverse": "^7.0.6"
             }
         },
         "babel-preset-jest": {
-            "version": "25.1.0",
-            "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-25.1.0.tgz",
-            "integrity": "sha512-eCGn64olaqwUMaugXsTtGAM2I0QTahjEtnRu0ql8Ie+gDWAc1N6wqN0k2NilnyTunM69Pad7gJY7LOtwLimoFQ==",
+            "version": "25.2.1",
+            "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-25.2.1.tgz",
+            "integrity": "sha512-zXHJBM5iR8oEO4cvdF83AQqqJf3tJrXy3x8nfu2Nlqvn4cneg4Ca8M7cQvC5S9BzDDy1O0tZ9iXru9J6E3ym+A==",
             "dev": true,
             "requires": {
                 "@babel/plugin-syntax-bigint": "^7.0.0",
                 "@babel/plugin-syntax-object-rest-spread": "^7.0.0",
-                "babel-plugin-jest-hoist": "^25.1.0"
+                "babel-plugin-jest-hoist": "^25.2.1"
             }
         },
         "balanced-match": {
@@ -2201,14 +2552,11 @@
             "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=",
             "dev": true
         },
-        "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==",
-            "dev": true,
-            "requires": {
-                "object-keys": "^1.0.12"
-            }
+        "deepmerge": {
+            "version": "4.2.2",
+            "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz",
+            "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==",
+            "dev": true
         },
         "define-property": {
             "version": "2.0.2",
@@ -2347,36 +2695,6 @@
                 "is-arrayish": "^0.2.1"
             }
         },
-        "es-abstract": {
-            "version": "1.17.4",
-            "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz",
-            "integrity": "sha512-Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ==",
-            "dev": true,
-            "requires": {
-                "es-to-primitive": "^1.2.1",
-                "function-bind": "^1.1.1",
-                "has": "^1.0.3",
-                "has-symbols": "^1.0.1",
-                "is-callable": "^1.1.5",
-                "is-regex": "^1.0.5",
-                "object-inspect": "^1.7.0",
-                "object-keys": "^1.1.1",
-                "object.assign": "^4.1.0",
-                "string.prototype.trimleft": "^2.1.1",
-                "string.prototype.trimright": "^2.1.1"
-            }
-        },
-        "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"
-            }
-        },
         "es5-ext": {
             "version": "0.10.53",
             "resolved": "https://registry.npmjs.org/es5-ext/-/es5-ext-0.10.53.tgz",
@@ -2692,19 +3010,31 @@
             "integrity": "sha512-XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg=="
         },
         "expect": {
-            "version": "25.1.0",
-            "resolved": "https://registry.npmjs.org/expect/-/expect-25.1.0.tgz",
-            "integrity": "sha512-wqHzuoapQkhc3OKPlrpetsfueuEiMf3iWh0R8+duCu9PIjXoP7HgD5aeypwTnXUAjC8aMsiVDaWwlbJ1RlQ38g==",
+            "version": "25.2.4",
+            "resolved": "https://registry.npmjs.org/expect/-/expect-25.2.4.tgz",
+            "integrity": "sha512-hfuPhPds4yOsZtIw4kwAg70r0hqGmpqekgA+VX7pf/3wZ6FY+xIOXZhNsPMMMsspYG/YIsbAiwqsdnD4Ht+bCA==",
             "dev": true,
             "requires": {
-                "@jest/types": "^25.1.0",
+                "@jest/types": "^25.2.3",
                 "ansi-styles": "^4.0.0",
-                "jest-get-type": "^25.1.0",
-                "jest-matcher-utils": "^25.1.0",
-                "jest-message-util": "^25.1.0",
-                "jest-regex-util": "^25.1.0"
+                "jest-get-type": "^25.2.1",
+                "jest-matcher-utils": "^25.2.3",
+                "jest-message-util": "^25.2.4",
+                "jest-regex-util": "^25.2.1"
             },
             "dependencies": {
+                "@jest/types": {
+                    "version": "25.2.3",
+                    "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.2.3.tgz",
+                    "integrity": "sha512-6oLQwO9mKif3Uph3RX5J1i3S7X7xtDHWBaaaoeKw8hOzV6YUd0qDcYcHZ6QXMHDIzSr7zzrEa51o2Ovlj6AtKQ==",
+                    "dev": true,
+                    "requires": {
+                        "@types/istanbul-lib-coverage": "^2.0.0",
+                        "@types/istanbul-reports": "^1.1.1",
+                        "@types/yargs": "^15.0.0",
+                        "chalk": "^3.0.0"
+                    }
+                },
                 "ansi-styles": {
                     "version": "4.2.1",
                     "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
@@ -2715,6 +3045,16 @@
                         "color-convert": "^2.0.1"
                     }
                 },
+                "chalk": {
+                    "version": "3.0.0",
+                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+                    "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+                    "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",
@@ -2729,6 +3069,27 @@
                     "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
+                },
+                "jest-get-type": {
+                    "version": "25.2.1",
+                    "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-25.2.1.tgz",
+                    "integrity": "sha512-EYjTiqcDTCRJDcSNKbLTwn/LcDPEE7ITk8yRMNAOjEsN6yp+Uu+V1gx4djwnuj/DvWg0YGmqaBqPVGsPxlvE7w==",
+                    "dev": true
+                },
+                "supports-color": {
+                    "version": "7.1.0",
+                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+                    "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+                    "dev": true,
+                    "requires": {
+                        "has-flag": "^4.0.0"
+                    }
                 }
             }
         },
@@ -3038,12 +3399,6 @@
                 "rimraf": "2"
             }
         },
-        "function-bind": {
-            "version": "1.1.1",
-            "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
-            "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==",
-            "dev": true
-        },
         "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",
@@ -3213,26 +3568,11 @@
                 "har-schema": "^2.0.0"
             }
         },
-        "has": {
-            "version": "1.0.3",
-            "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz",
-            "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==",
-            "dev": true,
-            "requires": {
-                "function-bind": "^1.1.1"
-            }
-        },
         "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.1",
-            "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz",
-            "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==",
-            "dev": true
-        },
         "has-unicode": {
             "version": "2.0.1",
             "resolved": "https://registry.npmjs.org/has-unicode/-/has-unicode-2.0.1.tgz",
@@ -3306,9 +3646,9 @@
             }
         },
         "html-escaper": {
-            "version": "2.0.0",
-            "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.0.tgz",
-            "integrity": "sha512-a4u9BeERWGu/S8JiWEAQcdrg9v4QArtP9keViQjGMdff20fBdd8waotXaNmODqBe6uZ3Nafi7K/ho4gCQHV3Ig==",
+            "version": "2.0.2",
+            "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
+            "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==",
             "dev": true
         },
         "http-signature": {
@@ -3632,12 +3972,6 @@
             "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==",
             "dev": true
         },
-        "is-callable": {
-            "version": "1.1.5",
-            "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.5.tgz",
-            "integrity": "sha512-ESKv5sMCJB2jnHTWZ3O5itG+O128Hsus4K4Qh1h2/cgn2vbgnLSVqfV46AeJA9D5EeeLa9w81KUXMtn34zhX+Q==",
-            "dev": true
-        },
         "is-ci": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz",
@@ -3667,12 +4001,6 @@
                 }
             }
         },
-        "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==",
-            "dev": true
-        },
         "is-descriptor": {
             "version": "0.1.6",
             "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz",
@@ -3753,30 +4081,12 @@
             "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=",
             "dev": true
         },
-        "is-regex": {
-            "version": "1.0.5",
-            "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.5.tgz",
-            "integrity": "sha512-vlKW17SNq44owv5AQR3Cq0bQPEb8+kF3UKZ2fiZNOWtztYE5i0CzCZxFDwO58qAOWtxdBRVO/V5Qin1wjCqFYQ==",
-            "dev": true,
-            "requires": {
-                "has": "^1.0.3"
-            }
-        },
         "is-stream": {
             "version": "1.1.0",
             "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
             "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=",
             "dev": true
         },
-        "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==",
-            "dev": true,
-            "requires": {
-                "has-symbols": "^1.0.1"
-            }
-        },
         "is-typedarray": {
             "version": "1.0.0",
             "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz",
@@ -3902,9 +4212,9 @@
             }
         },
         "istanbul-reports": {
-            "version": "3.0.0",
-            "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.0.0.tgz",
-            "integrity": "sha512-2osTcC8zcOSUkImzN2EWQta3Vdi4WjjKw99P2yWx5mLnigAM0Rd5uYFn1cf2i/Ois45GkNjaoTqc5CxgMSX80A==",
+            "version": "3.0.1",
+            "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.0.1.tgz",
+            "integrity": "sha512-Vm9xwCiQ8t2cNNnckyeAV0UdxKpcQUz4nMxsBvIu8n2kmPSiyb5uaF/8LpmKr+yqL/MdOXaX2Nmdo4Qyxium9Q==",
             "dev": true,
             "requires": {
                 "html-escaper": "^2.0.0",
@@ -3912,16 +4222,28 @@
             }
         },
         "jest": {
-            "version": "25.1.0",
-            "resolved": "https://registry.npmjs.org/jest/-/jest-25.1.0.tgz",
-            "integrity": "sha512-FV6jEruneBhokkt9MQk0WUFoNTwnF76CLXtwNMfsc0um0TlB/LG2yxUd0KqaFjEJ9laQmVWQWS0sG/t2GsuI0w==",
+            "version": "25.2.4",
+            "resolved": "https://registry.npmjs.org/jest/-/jest-25.2.4.tgz",
+            "integrity": "sha512-Lu4LXxf4+durzN/IFilcAoQSisOwgHIXgl9vffopePpSSwFqfj1Pj4y+k3nL8oTbnvjxgDIsEcepy6he4bWqnQ==",
             "dev": true,
             "requires": {
-                "@jest/core": "^25.1.0",
+                "@jest/core": "^25.2.4",
                 "import-local": "^3.0.2",
-                "jest-cli": "^25.1.0"
+                "jest-cli": "^25.2.4"
             },
             "dependencies": {
+                "@jest/types": {
+                    "version": "25.2.3",
+                    "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.2.3.tgz",
+                    "integrity": "sha512-6oLQwO9mKif3Uph3RX5J1i3S7X7xtDHWBaaaoeKw8hOzV6YUd0qDcYcHZ6QXMHDIzSr7zzrEa51o2Ovlj6AtKQ==",
+                    "dev": true,
+                    "requires": {
+                        "@types/istanbul-lib-coverage": "^2.0.0",
+                        "@types/istanbul-reports": "^1.1.1",
+                        "@types/yargs": "^15.0.0",
+                        "chalk": "^3.0.0"
+                    }
+                },
                 "ansi-regex": {
                     "version": "5.0.0",
                     "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
@@ -3987,24 +4309,24 @@
                     "dev": true
                 },
                 "jest-cli": {
-                    "version": "25.1.0",
-                    "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-25.1.0.tgz",
-                    "integrity": "sha512-p+aOfczzzKdo3AsLJlhs8J5EW6ffVidfSZZxXedJ0mHPBOln1DccqFmGCoO8JWd4xRycfmwy1eoQkMsF8oekPg==",
+                    "version": "25.2.4",
+                    "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-25.2.4.tgz",
+                    "integrity": "sha512-zeY2pRDWKj2LZudIncvvguwLMEdcnJqc2jJbwza1beqi80qqLvkPF/BjbFkK2sIV3r+mfTJS+7ITrvK6pCdRjg==",
                     "dev": true,
                     "requires": {
-                        "@jest/core": "^25.1.0",
-                        "@jest/test-result": "^25.1.0",
-                        "@jest/types": "^25.1.0",
+                        "@jest/core": "^25.2.4",
+                        "@jest/test-result": "^25.2.4",
+                        "@jest/types": "^25.2.3",
                         "chalk": "^3.0.0",
                         "exit": "^0.1.2",
                         "import-local": "^3.0.2",
                         "is-ci": "^2.0.0",
-                        "jest-config": "^25.1.0",
-                        "jest-util": "^25.1.0",
-                        "jest-validate": "^25.1.0",
+                        "jest-config": "^25.2.4",
+                        "jest-util": "^25.2.3",
+                        "jest-validate": "^25.2.3",
                         "prompts": "^2.0.1",
-                        "realpath-native": "^1.1.0",
-                        "yargs": "^15.0.0"
+                        "realpath-native": "^2.0.0",
+                        "yargs": "^15.3.1"
                     }
                 },
                 "string-width": {
@@ -4054,9 +4376,9 @@
                     "dev": true
                 },
                 "yargs": {
-                    "version": "15.1.0",
-                    "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.1.0.tgz",
-                    "integrity": "sha512-T39FNN1b6hCW4SOIk1XyTOWxtXdcen0t+XYrysQmChzSipvhBO8Bj0nK1ozAasdk24dNWuMZvr4k24nz+8HHLg==",
+                    "version": "15.3.1",
+                    "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.3.1.tgz",
+                    "integrity": "sha512-92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA==",
                     "dev": true,
                     "requires": {
                         "cliui": "^6.0.0",
@@ -4069,22 +4391,79 @@
                         "string-width": "^4.2.0",
                         "which-module": "^2.0.0",
                         "y18n": "^4.0.0",
-                        "yargs-parser": "^16.1.0"
+                        "yargs-parser": "^18.1.1"
+                    }
+                },
+                "yargs-parser": {
+                    "version": "18.1.2",
+                    "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.2.tgz",
+                    "integrity": "sha512-hlIPNR3IzC1YuL1c2UwwDKpXlNFBqD1Fswwh1khz5+d8Cq/8yc/Mn0i+rQXduu8hcrFKvO7Eryk+09NecTQAAQ==",
+                    "dev": true,
+                    "requires": {
+                        "camelcase": "^5.0.0",
+                        "decamelize": "^1.2.0"
                     }
                 }
             }
         },
         "jest-changed-files": {
-            "version": "25.1.0",
-            "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-25.1.0.tgz",
-            "integrity": "sha512-bdL1aHjIVy3HaBO3eEQeemGttsq1BDlHgWcOjEOIAcga7OOEGWHD2WSu8HhL7I1F0mFFyci8VKU4tRNk+qtwDA==",
+            "version": "25.2.3",
+            "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-25.2.3.tgz",
+            "integrity": "sha512-EFxy94dvvbqRB36ezIPLKJ4fDIC+jAdNs8i8uTwFpaXd6H3LVc3ova1lNS4ZPWk09OCR2vq5kSdSQgar7zMORg==",
             "dev": true,
             "requires": {
-                "@jest/types": "^25.1.0",
+                "@jest/types": "^25.2.3",
                 "execa": "^3.2.0",
                 "throat": "^5.0.0"
             },
             "dependencies": {
+                "@jest/types": {
+                    "version": "25.2.3",
+                    "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.2.3.tgz",
+                    "integrity": "sha512-6oLQwO9mKif3Uph3RX5J1i3S7X7xtDHWBaaaoeKw8hOzV6YUd0qDcYcHZ6QXMHDIzSr7zzrEa51o2Ovlj6AtKQ==",
+                    "dev": true,
+                    "requires": {
+                        "@types/istanbul-lib-coverage": "^2.0.0",
+                        "@types/istanbul-reports": "^1.1.1",
+                        "@types/yargs": "^15.0.0",
+                        "chalk": "^3.0.0"
+                    }
+                },
+                "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==",
+                    "dev": true,
+                    "requires": {
+                        "@types/color-name": "^1.1.1",
+                        "color-convert": "^2.0.1"
+                    }
+                },
+                "chalk": {
+                    "version": "3.0.0",
+                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+                    "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+                    "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
+                },
                 "cross-spawn": {
                     "version": "7.0.1",
                     "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.1.tgz",
@@ -4123,6 +4502,12 @@
                         "pump": "^3.0.0"
                     }
                 },
+                "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
+                },
                 "is-stream": {
                     "version": "2.0.0",
                     "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz",
@@ -4165,6 +4550,15 @@
                     "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
                     "dev": true
                 },
+                "supports-color": {
+                    "version": "7.1.0",
+                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+                    "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+                    "dev": true,
+                    "requires": {
+                        "has-flag": "^4.0.0"
+                    }
+                },
                 "which": {
                     "version": "2.0.2",
                     "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
@@ -4177,30 +4571,49 @@
             }
         },
         "jest-config": {
-            "version": "25.1.0",
-            "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-25.1.0.tgz",
-            "integrity": "sha512-tLmsg4SZ5H7tuhBC5bOja0HEblM0coS3Wy5LTCb2C8ZV6eWLewHyK+3qSq9Bi29zmWQ7ojdCd3pxpx4l4d2uGw==",
+            "version": "25.2.4",
+            "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-25.2.4.tgz",
+            "integrity": "sha512-fxy3nIpwJqOUQJRVF/q+pNQb6dv5b9YufOeCbpPZJ/md1zXpiupbhfehpfODhnKOfqbzSiigtSLzlWWmbRxnqQ==",
             "dev": true,
             "requires": {
                 "@babel/core": "^7.1.0",
-                "@jest/test-sequencer": "^25.1.0",
-                "@jest/types": "^25.1.0",
-                "babel-jest": "^25.1.0",
+                "@jest/test-sequencer": "^25.2.4",
+                "@jest/types": "^25.2.3",
+                "babel-jest": "^25.2.4",
                 "chalk": "^3.0.0",
+                "deepmerge": "^4.2.2",
                 "glob": "^7.1.1",
-                "jest-environment-jsdom": "^25.1.0",
-                "jest-environment-node": "^25.1.0",
-                "jest-get-type": "^25.1.0",
-                "jest-jasmine2": "^25.1.0",
-                "jest-regex-util": "^25.1.0",
-                "jest-resolve": "^25.1.0",
-                "jest-util": "^25.1.0",
-                "jest-validate": "^25.1.0",
+                "jest-environment-jsdom": "^25.2.4",
+                "jest-environment-node": "^25.2.4",
+                "jest-get-type": "^25.2.1",
+                "jest-jasmine2": "^25.2.4",
+                "jest-regex-util": "^25.2.1",
+                "jest-resolve": "^25.2.3",
+                "jest-util": "^25.2.3",
+                "jest-validate": "^25.2.3",
                 "micromatch": "^4.0.2",
-                "pretty-format": "^25.1.0",
-                "realpath-native": "^1.1.0"
+                "pretty-format": "^25.2.3",
+                "realpath-native": "^2.0.0"
             },
             "dependencies": {
+                "@jest/types": {
+                    "version": "25.2.3",
+                    "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.2.3.tgz",
+                    "integrity": "sha512-6oLQwO9mKif3Uph3RX5J1i3S7X7xtDHWBaaaoeKw8hOzV6YUd0qDcYcHZ6QXMHDIzSr7zzrEa51o2Ovlj6AtKQ==",
+                    "dev": true,
+                    "requires": {
+                        "@types/istanbul-lib-coverage": "^2.0.0",
+                        "@types/istanbul-reports": "^1.1.1",
+                        "@types/yargs": "^15.0.0",
+                        "chalk": "^3.0.0"
+                    }
+                },
+                "ansi-regex": {
+                    "version": "5.0.0",
+                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+                    "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+                    "dev": true
+                },
                 "ansi-styles": {
                     "version": "4.2.1",
                     "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
@@ -4242,6 +4655,24 @@
                     "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
                     "dev": true
                 },
+                "jest-get-type": {
+                    "version": "25.2.1",
+                    "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-25.2.1.tgz",
+                    "integrity": "sha512-EYjTiqcDTCRJDcSNKbLTwn/LcDPEE7ITk8yRMNAOjEsN6yp+Uu+V1gx4djwnuj/DvWg0YGmqaBqPVGsPxlvE7w==",
+                    "dev": true
+                },
+                "pretty-format": {
+                    "version": "25.2.3",
+                    "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.2.3.tgz",
+                    "integrity": "sha512-IP4+5UOAVGoyqC/DiomOeHBUKN6q00gfyT2qpAsRH64tgOKB2yF7FHJXC18OCiU0/YFierACup/zdCOWw0F/0w==",
+                    "dev": true,
+                    "requires": {
+                        "@jest/types": "^25.2.3",
+                        "ansi-regex": "^5.0.0",
+                        "ansi-styles": "^4.0.0",
+                        "react-is": "^16.12.0"
+                    }
+                },
                 "supports-color": {
                     "version": "7.1.0",
                     "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
@@ -4318,27 +4749,45 @@
             }
         },
         "jest-docblock": {
-            "version": "25.1.0",
-            "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-25.1.0.tgz",
-            "integrity": "sha512-370P/mh1wzoef6hUKiaMcsPtIapY25suP6JqM70V9RJvdKLrV4GaGbfUseUVk4FZJw4oTZ1qSCJNdrClKt5JQA==",
+            "version": "25.2.3",
+            "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-25.2.3.tgz",
+            "integrity": "sha512-d3/tmjLLrH5fpRGmIm3oFa3vOaD/IjPxtXVOrfujpfJ9y1tCDB1x/tvunmdOVAyF03/xeMwburl6ITbiQT1mVA==",
             "dev": true,
             "requires": {
                 "detect-newline": "^3.0.0"
             }
         },
         "jest-each": {
-            "version": "25.1.0",
-            "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-25.1.0.tgz",
-            "integrity": "sha512-R9EL8xWzoPySJ5wa0DXFTj7NrzKpRD40Jy+zQDp3Qr/2QmevJgkN9GqioCGtAJ2bW9P/MQRznQHQQhoeAyra7A==",
+            "version": "25.2.3",
+            "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-25.2.3.tgz",
+            "integrity": "sha512-RTlmCjsBDK2c9T5oO4MqccA3/5Y8BUtiEy7OOQik1iyCgdnNdHbI0pNEpyapZPBG0nlvZ4mIu7aY6zNUvLraAQ==",
             "dev": true,
             "requires": {
-                "@jest/types": "^25.1.0",
+                "@jest/types": "^25.2.3",
                 "chalk": "^3.0.0",
-                "jest-get-type": "^25.1.0",
-                "jest-util": "^25.1.0",
-                "pretty-format": "^25.1.0"
+                "jest-get-type": "^25.2.1",
+                "jest-util": "^25.2.3",
+                "pretty-format": "^25.2.3"
             },
             "dependencies": {
+                "@jest/types": {
+                    "version": "25.2.3",
+                    "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.2.3.tgz",
+                    "integrity": "sha512-6oLQwO9mKif3Uph3RX5J1i3S7X7xtDHWBaaaoeKw8hOzV6YUd0qDcYcHZ6QXMHDIzSr7zzrEa51o2Ovlj6AtKQ==",
+                    "dev": true,
+                    "requires": {
+                        "@types/istanbul-lib-coverage": "^2.0.0",
+                        "@types/istanbul-reports": "^1.1.1",
+                        "@types/yargs": "^15.0.0",
+                        "chalk": "^3.0.0"
+                    }
+                },
+                "ansi-regex": {
+                    "version": "5.0.0",
+                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+                    "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+                    "dev": true
+                },
                 "ansi-styles": {
                     "version": "4.2.1",
                     "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
@@ -4380,6 +4829,24 @@
                     "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
                     "dev": true
                 },
+                "jest-get-type": {
+                    "version": "25.2.1",
+                    "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-25.2.1.tgz",
+                    "integrity": "sha512-EYjTiqcDTCRJDcSNKbLTwn/LcDPEE7ITk8yRMNAOjEsN6yp+Uu+V1gx4djwnuj/DvWg0YGmqaBqPVGsPxlvE7w==",
+                    "dev": true
+                },
+                "pretty-format": {
+                    "version": "25.2.3",
+                    "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.2.3.tgz",
+                    "integrity": "sha512-IP4+5UOAVGoyqC/DiomOeHBUKN6q00gfyT2qpAsRH64tgOKB2yF7FHJXC18OCiU0/YFierACup/zdCOWw0F/0w==",
+                    "dev": true,
+                    "requires": {
+                        "@jest/types": "^25.2.3",
+                        "ansi-regex": "^5.0.0",
+                        "ansi-styles": "^4.0.0",
+                        "react-is": "^16.12.0"
+                    }
+                },
                 "supports-color": {
                     "version": "7.1.0",
                     "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
@@ -4392,90 +4859,31 @@
             }
         },
         "jest-environment-jsdom": {
-            "version": "25.1.0",
-            "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-25.1.0.tgz",
-            "integrity": "sha512-ILb4wdrwPAOHX6W82GGDUiaXSSOE274ciuov0lztOIymTChKFtC02ddyicRRCdZlB5YSrv3vzr1Z5xjpEe1OHQ==",
+            "version": "25.2.4",
+            "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-25.2.4.tgz",
+            "integrity": "sha512-5dm+tNwrLmhELdjAwiQnVGf/U9iFMWdTL4/wyrMg2HU6RQnCiuxpWbIigLHUhuP1P2Ak0F4k3xhjrikboKyShA==",
             "dev": true,
             "requires": {
-                "@jest/environment": "^25.1.0",
-                "@jest/fake-timers": "^25.1.0",
-                "@jest/types": "^25.1.0",
-                "jest-mock": "^25.1.0",
-                "jest-util": "^25.1.0",
-                "jsdom": "^15.1.1"
-            }
-        },
-        "jest-environment-node": {
-            "version": "25.1.0",
-            "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-25.1.0.tgz",
-            "integrity": "sha512-U9kFWTtAPvhgYY5upnH9rq8qZkj6mYLup5l1caAjjx9uNnkLHN2xgZy5mo4SyLdmrh/EtB9UPpKFShvfQHD0Iw==",
-            "dev": true,
-            "requires": {
-                "@jest/environment": "^25.1.0",
-                "@jest/fake-timers": "^25.1.0",
-                "@jest/types": "^25.1.0",
-                "jest-mock": "^25.1.0",
-                "jest-util": "^25.1.0"
-            }
-        },
-        "jest-get-type": {
-            "version": "25.1.0",
-            "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-25.1.0.tgz",
-            "integrity": "sha512-yWkBnT+5tMr8ANB6V+OjmrIJufHtCAqI5ic2H40v+tRqxDmE0PGnIiTyvRWFOMtmVHYpwRqyazDbTnhpjsGvLw==",
-            "dev": true
-        },
-        "jest-haste-map": {
-            "version": "25.1.0",
-            "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-25.1.0.tgz",
-            "integrity": "sha512-/2oYINIdnQZAqyWSn1GTku571aAfs8NxzSErGek65Iu5o8JYb+113bZysRMcC/pjE5v9w0Yz+ldbj9NxrFyPyw==",
-            "dev": true,
-            "requires": {
-                "@jest/types": "^25.1.0",
-                "anymatch": "^3.0.3",
-                "fb-watchman": "^2.0.0",
-                "fsevents": "^2.1.2",
-                "graceful-fs": "^4.2.3",
-                "jest-serializer": "^25.1.0",
-                "jest-util": "^25.1.0",
-                "jest-worker": "^25.1.0",
-                "micromatch": "^4.0.2",
-                "sane": "^4.0.3",
-                "walker": "^1.0.7"
-            },
-            "dependencies": {
-                "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==",
-                    "dev": true
-                }
-            }
-        },
-        "jest-jasmine2": {
-            "version": "25.1.0",
-            "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-25.1.0.tgz",
-            "integrity": "sha512-GdncRq7jJ7sNIQ+dnXvpKO2MyP6j3naNK41DTTjEAhLEdpImaDA9zSAZwDhijjSF/D7cf4O5fdyUApGBZleaEg==",
-            "dev": true,
-            "requires": {
-                "@babel/traverse": "^7.1.0",
-                "@jest/environment": "^25.1.0",
-                "@jest/source-map": "^25.1.0",
-                "@jest/test-result": "^25.1.0",
-                "@jest/types": "^25.1.0",
-                "chalk": "^3.0.0",
-                "co": "^4.6.0",
-                "expect": "^25.1.0",
-                "is-generator-fn": "^2.0.0",
-                "jest-each": "^25.1.0",
-                "jest-matcher-utils": "^25.1.0",
-                "jest-message-util": "^25.1.0",
-                "jest-runtime": "^25.1.0",
-                "jest-snapshot": "^25.1.0",
-                "jest-util": "^25.1.0",
-                "pretty-format": "^25.1.0",
-                "throat": "^5.0.0"
+                "@jest/environment": "^25.2.4",
+                "@jest/fake-timers": "^25.2.4",
+                "@jest/types": "^25.2.3",
+                "jest-mock": "^25.2.3",
+                "jest-util": "^25.2.3",
+                "jsdom": "^15.2.1"
             },
             "dependencies": {
+                "@jest/types": {
+                    "version": "25.2.3",
+                    "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.2.3.tgz",
+                    "integrity": "sha512-6oLQwO9mKif3Uph3RX5J1i3S7X7xtDHWBaaaoeKw8hOzV6YUd0qDcYcHZ6QXMHDIzSr7zzrEa51o2Ovlj6AtKQ==",
+                    "dev": true,
+                    "requires": {
+                        "@types/istanbul-lib-coverage": "^2.0.0",
+                        "@types/istanbul-reports": "^1.1.1",
+                        "@types/yargs": "^15.0.0",
+                        "chalk": "^3.0.0"
+                    }
+                },
                 "ansi-styles": {
                     "version": "4.2.1",
                     "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
@@ -4528,28 +4936,330 @@
                 }
             }
         },
+        "jest-environment-node": {
+            "version": "25.2.4",
+            "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-25.2.4.tgz",
+            "integrity": "sha512-Jkc5Y8goyXPrLRHnrUlqC7P4o5zn2m4zw6qWoRJ59kxV1f2a5wK+TTGhrhCwnhW/Ckpdl/pm+LufdvhJkvJbiw==",
+            "dev": true,
+            "requires": {
+                "@jest/environment": "^25.2.4",
+                "@jest/fake-timers": "^25.2.4",
+                "@jest/types": "^25.2.3",
+                "jest-mock": "^25.2.3",
+                "jest-util": "^25.2.3",
+                "semver": "^6.3.0"
+            },
+            "dependencies": {
+                "@jest/types": {
+                    "version": "25.2.3",
+                    "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.2.3.tgz",
+                    "integrity": "sha512-6oLQwO9mKif3Uph3RX5J1i3S7X7xtDHWBaaaoeKw8hOzV6YUd0qDcYcHZ6QXMHDIzSr7zzrEa51o2Ovlj6AtKQ==",
+                    "dev": true,
+                    "requires": {
+                        "@types/istanbul-lib-coverage": "^2.0.0",
+                        "@types/istanbul-reports": "^1.1.1",
+                        "@types/yargs": "^15.0.0",
+                        "chalk": "^3.0.0"
+                    }
+                },
+                "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==",
+                    "dev": true,
+                    "requires": {
+                        "@types/color-name": "^1.1.1",
+                        "color-convert": "^2.0.1"
+                    }
+                },
+                "chalk": {
+                    "version": "3.0.0",
+                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+                    "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+                    "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
+                },
+                "semver": {
+                    "version": "6.3.0",
+                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+                    "dev": true
+                },
+                "supports-color": {
+                    "version": "7.1.0",
+                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+                    "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+                    "dev": true,
+                    "requires": {
+                        "has-flag": "^4.0.0"
+                    }
+                }
+            }
+        },
+        "jest-get-type": {
+            "version": "25.1.0",
+            "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-25.1.0.tgz",
+            "integrity": "sha512-yWkBnT+5tMr8ANB6V+OjmrIJufHtCAqI5ic2H40v+tRqxDmE0PGnIiTyvRWFOMtmVHYpwRqyazDbTnhpjsGvLw==",
+            "dev": true
+        },
+        "jest-haste-map": {
+            "version": "25.2.3",
+            "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-25.2.3.tgz",
+            "integrity": "sha512-pAP22OHtPr4qgZlJJFks2LLgoQUr4XtM1a+F5UaPIZNiCRnePA0hM3L7aiJ0gzwiNIYwMTfKRwG/S1L28J3A3A==",
+            "dev": true,
+            "requires": {
+                "@jest/types": "^25.2.3",
+                "anymatch": "^3.0.3",
+                "fb-watchman": "^2.0.0",
+                "fsevents": "^2.1.2",
+                "graceful-fs": "^4.2.3",
+                "jest-serializer": "^25.2.1",
+                "jest-util": "^25.2.3",
+                "jest-worker": "^25.2.1",
+                "micromatch": "^4.0.2",
+                "sane": "^4.0.3",
+                "walker": "^1.0.7",
+                "which": "^2.0.2"
+            },
+            "dependencies": {
+                "@jest/types": {
+                    "version": "25.2.3",
+                    "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.2.3.tgz",
+                    "integrity": "sha512-6oLQwO9mKif3Uph3RX5J1i3S7X7xtDHWBaaaoeKw8hOzV6YUd0qDcYcHZ6QXMHDIzSr7zzrEa51o2Ovlj6AtKQ==",
+                    "dev": true,
+                    "requires": {
+                        "@types/istanbul-lib-coverage": "^2.0.0",
+                        "@types/istanbul-reports": "^1.1.1",
+                        "@types/yargs": "^15.0.0",
+                        "chalk": "^3.0.0"
+                    }
+                },
+                "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==",
+                    "dev": true,
+                    "requires": {
+                        "@types/color-name": "^1.1.1",
+                        "color-convert": "^2.0.1"
+                    }
+                },
+                "chalk": {
+                    "version": "3.0.0",
+                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+                    "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+                    "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
+                },
+                "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==",
+                    "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.1.0",
+                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+                    "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+                    "dev": true,
+                    "requires": {
+                        "has-flag": "^4.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"
+                    }
+                }
+            }
+        },
+        "jest-jasmine2": {
+            "version": "25.2.4",
+            "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-25.2.4.tgz",
+            "integrity": "sha512-juoKrmNmLwaheNbAg71SuUF9ovwUZCFNTpKVhvCXWk+SSeORcIUMptKdPCoLXV3D16htzhTSKmNxnxSk4SrTjA==",
+            "dev": true,
+            "requires": {
+                "@babel/traverse": "^7.1.0",
+                "@jest/environment": "^25.2.4",
+                "@jest/source-map": "^25.2.1",
+                "@jest/test-result": "^25.2.4",
+                "@jest/types": "^25.2.3",
+                "chalk": "^3.0.0",
+                "co": "^4.6.0",
+                "expect": "^25.2.4",
+                "is-generator-fn": "^2.0.0",
+                "jest-each": "^25.2.3",
+                "jest-matcher-utils": "^25.2.3",
+                "jest-message-util": "^25.2.4",
+                "jest-runtime": "^25.2.4",
+                "jest-snapshot": "^25.2.4",
+                "jest-util": "^25.2.3",
+                "pretty-format": "^25.2.3",
+                "throat": "^5.0.0"
+            },
+            "dependencies": {
+                "@jest/types": {
+                    "version": "25.2.3",
+                    "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.2.3.tgz",
+                    "integrity": "sha512-6oLQwO9mKif3Uph3RX5J1i3S7X7xtDHWBaaaoeKw8hOzV6YUd0qDcYcHZ6QXMHDIzSr7zzrEa51o2Ovlj6AtKQ==",
+                    "dev": true,
+                    "requires": {
+                        "@types/istanbul-lib-coverage": "^2.0.0",
+                        "@types/istanbul-reports": "^1.1.1",
+                        "@types/yargs": "^15.0.0",
+                        "chalk": "^3.0.0"
+                    }
+                },
+                "ansi-regex": {
+                    "version": "5.0.0",
+                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+                    "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+                    "dev": true
+                },
+                "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==",
+                    "dev": true,
+                    "requires": {
+                        "@types/color-name": "^1.1.1",
+                        "color-convert": "^2.0.1"
+                    }
+                },
+                "chalk": {
+                    "version": "3.0.0",
+                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+                    "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+                    "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
+                },
+                "pretty-format": {
+                    "version": "25.2.3",
+                    "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.2.3.tgz",
+                    "integrity": "sha512-IP4+5UOAVGoyqC/DiomOeHBUKN6q00gfyT2qpAsRH64tgOKB2yF7FHJXC18OCiU0/YFierACup/zdCOWw0F/0w==",
+                    "dev": true,
+                    "requires": {
+                        "@jest/types": "^25.2.3",
+                        "ansi-regex": "^5.0.0",
+                        "ansi-styles": "^4.0.0",
+                        "react-is": "^16.12.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==",
+                    "dev": true,
+                    "requires": {
+                        "has-flag": "^4.0.0"
+                    }
+                }
+            }
+        },
         "jest-leak-detector": {
-            "version": "25.1.0",
-            "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-25.1.0.tgz",
-            "integrity": "sha512-3xRI264dnhGaMHRvkFyEKpDeaRzcEBhyNrOG5oT8xPxOyUAblIAQnpiR3QXu4wDor47MDTiHbiFcbypdLcLW5w==",
+            "version": "25.2.3",
+            "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-25.2.3.tgz",
+            "integrity": "sha512-yblCMPE7NJKl7778Cf/73yyFWAas5St0iiEBwq7RDyaz6Xd4WPFnPz2j7yDb/Qce71A1IbDoLADlcwD8zT74Aw==",
             "dev": true,
             "requires": {
-                "jest-get-type": "^25.1.0",
-                "pretty-format": "^25.1.0"
-            }
-        },
-        "jest-matcher-utils": {
-            "version": "25.1.0",
-            "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-25.1.0.tgz",
-            "integrity": "sha512-KGOAFcSFbclXIFE7bS4C53iYobKI20ZWleAdAFun4W1Wz1Kkej8Ng6RRbhL8leaEvIOjGXhGf/a1JjO8bkxIWQ==",
-            "dev": true,
-            "requires": {
-                "chalk": "^3.0.0",
-                "jest-diff": "^25.1.0",
-                "jest-get-type": "^25.1.0",
-                "pretty-format": "^25.1.0"
+                "jest-get-type": "^25.2.1",
+                "pretty-format": "^25.2.3"
             },
             "dependencies": {
+                "@jest/types": {
+                    "version": "25.2.3",
+                    "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.2.3.tgz",
+                    "integrity": "sha512-6oLQwO9mKif3Uph3RX5J1i3S7X7xtDHWBaaaoeKw8hOzV6YUd0qDcYcHZ6QXMHDIzSr7zzrEa51o2Ovlj6AtKQ==",
+                    "dev": true,
+                    "requires": {
+                        "@types/istanbul-lib-coverage": "^2.0.0",
+                        "@types/istanbul-reports": "^1.1.1",
+                        "@types/yargs": "^15.0.0",
+                        "chalk": "^3.0.0"
+                    }
+                },
+                "ansi-regex": {
+                    "version": "5.0.0",
+                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+                    "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+                    "dev": true
+                },
                 "ansi-styles": {
                     "version": "4.2.1",
                     "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
@@ -4591,6 +5301,142 @@
                     "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
                     "dev": true
                 },
+                "jest-get-type": {
+                    "version": "25.2.1",
+                    "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-25.2.1.tgz",
+                    "integrity": "sha512-EYjTiqcDTCRJDcSNKbLTwn/LcDPEE7ITk8yRMNAOjEsN6yp+Uu+V1gx4djwnuj/DvWg0YGmqaBqPVGsPxlvE7w==",
+                    "dev": true
+                },
+                "pretty-format": {
+                    "version": "25.2.3",
+                    "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.2.3.tgz",
+                    "integrity": "sha512-IP4+5UOAVGoyqC/DiomOeHBUKN6q00gfyT2qpAsRH64tgOKB2yF7FHJXC18OCiU0/YFierACup/zdCOWw0F/0w==",
+                    "dev": true,
+                    "requires": {
+                        "@jest/types": "^25.2.3",
+                        "ansi-regex": "^5.0.0",
+                        "ansi-styles": "^4.0.0",
+                        "react-is": "^16.12.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==",
+                    "dev": true,
+                    "requires": {
+                        "has-flag": "^4.0.0"
+                    }
+                }
+            }
+        },
+        "jest-matcher-utils": {
+            "version": "25.2.3",
+            "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-25.2.3.tgz",
+            "integrity": "sha512-ZmiXiwQRVM9MoKjGMP5YsGGk2Th5ncyRxfXKz5AKsmU8m43kgNZirckVzaP61MlSa9LKmXbevdYqVp1ZKAw2Rw==",
+            "dev": true,
+            "requires": {
+                "chalk": "^3.0.0",
+                "jest-diff": "^25.2.3",
+                "jest-get-type": "^25.2.1",
+                "pretty-format": "^25.2.3"
+            },
+            "dependencies": {
+                "@jest/types": {
+                    "version": "25.2.3",
+                    "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.2.3.tgz",
+                    "integrity": "sha512-6oLQwO9mKif3Uph3RX5J1i3S7X7xtDHWBaaaoeKw8hOzV6YUd0qDcYcHZ6QXMHDIzSr7zzrEa51o2Ovlj6AtKQ==",
+                    "dev": true,
+                    "requires": {
+                        "@types/istanbul-lib-coverage": "^2.0.0",
+                        "@types/istanbul-reports": "^1.1.1",
+                        "@types/yargs": "^15.0.0",
+                        "chalk": "^3.0.0"
+                    }
+                },
+                "ansi-regex": {
+                    "version": "5.0.0",
+                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+                    "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+                    "dev": true
+                },
+                "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==",
+                    "dev": true,
+                    "requires": {
+                        "@types/color-name": "^1.1.1",
+                        "color-convert": "^2.0.1"
+                    }
+                },
+                "chalk": {
+                    "version": "3.0.0",
+                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+                    "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+                    "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
+                },
+                "diff-sequences": {
+                    "version": "25.2.1",
+                    "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-25.2.1.tgz",
+                    "integrity": "sha512-foe7dXnGlSh3jR1ovJmdv+77VQj98eKCHHwJPbZ2eEf0fHwKbkZicpPxEch9smZ+n2dnF6QFwkOQdLq9hpeJUg==",
+                    "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
+                },
+                "jest-diff": {
+                    "version": "25.2.3",
+                    "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-25.2.3.tgz",
+                    "integrity": "sha512-VtZ6LAQtaQpFsmEzps15dQc5ELbJxy4L2DOSo2Ev411TUEtnJPkAMD7JneVypeMJQ1y3hgxN9Ao13n15FAnavg==",
+                    "dev": true,
+                    "requires": {
+                        "chalk": "^3.0.0",
+                        "diff-sequences": "^25.2.1",
+                        "jest-get-type": "^25.2.1",
+                        "pretty-format": "^25.2.3"
+                    }
+                },
+                "jest-get-type": {
+                    "version": "25.2.1",
+                    "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-25.2.1.tgz",
+                    "integrity": "sha512-EYjTiqcDTCRJDcSNKbLTwn/LcDPEE7ITk8yRMNAOjEsN6yp+Uu+V1gx4djwnuj/DvWg0YGmqaBqPVGsPxlvE7w==",
+                    "dev": true
+                },
+                "pretty-format": {
+                    "version": "25.2.3",
+                    "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.2.3.tgz",
+                    "integrity": "sha512-IP4+5UOAVGoyqC/DiomOeHBUKN6q00gfyT2qpAsRH64tgOKB2yF7FHJXC18OCiU0/YFierACup/zdCOWw0F/0w==",
+                    "dev": true,
+                    "requires": {
+                        "@jest/types": "^25.2.3",
+                        "ansi-regex": "^5.0.0",
+                        "ansi-styles": "^4.0.0",
+                        "react-is": "^16.12.0"
+                    }
+                },
                 "supports-color": {
                     "version": "7.1.0",
                     "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
@@ -4603,14 +5449,14 @@
             }
         },
         "jest-message-util": {
-            "version": "25.1.0",
-            "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-25.1.0.tgz",
-            "integrity": "sha512-Nr/Iwar2COfN22aCqX0kCVbXgn8IBm9nWf4xwGr5Olv/KZh0CZ32RKgZWMVDXGdOahicM10/fgjdimGNX/ttCQ==",
+            "version": "25.2.4",
+            "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-25.2.4.tgz",
+            "integrity": "sha512-9wWMH3Bf+GVTv0GcQLmH/FRr0x0toptKw9TA8U5YFLVXx7Tq9pvcNzTyJrcTJ+wLqNbMPPJlJNft4MnlcrtF5Q==",
             "dev": true,
             "requires": {
                 "@babel/code-frame": "^7.0.0",
-                "@jest/test-result": "^25.1.0",
-                "@jest/types": "^25.1.0",
+                "@jest/test-result": "^25.2.4",
+                "@jest/types": "^25.2.3",
                 "@types/stack-utils": "^1.0.1",
                 "chalk": "^3.0.0",
                 "micromatch": "^4.0.2",
@@ -4618,6 +5464,18 @@
                 "stack-utils": "^1.0.1"
             },
             "dependencies": {
+                "@jest/types": {
+                    "version": "25.2.3",
+                    "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.2.3.tgz",
+                    "integrity": "sha512-6oLQwO9mKif3Uph3RX5J1i3S7X7xtDHWBaaaoeKw8hOzV6YUd0qDcYcHZ6QXMHDIzSr7zzrEa51o2Ovlj6AtKQ==",
+                    "dev": true,
+                    "requires": {
+                        "@types/istanbul-lib-coverage": "^2.0.0",
+                        "@types/istanbul-reports": "^1.1.1",
+                        "@types/yargs": "^15.0.0",
+                        "chalk": "^3.0.0"
+                    }
+                },
                 "ansi-styles": {
                     "version": "4.2.1",
                     "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
@@ -4671,39 +5529,26 @@
             }
         },
         "jest-mock": {
-            "version": "25.1.0",
-            "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-25.1.0.tgz",
-            "integrity": "sha512-28/u0sqS+42vIfcd1mlcg4ZVDmSUYuNvImP4X2lX5hRMLW+CN0BeiKVD4p+ujKKbSPKd3rg/zuhCF+QBLJ4vag==",
+            "version": "25.2.3",
+            "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-25.2.3.tgz",
+            "integrity": "sha512-xlf+pyY0j47zoCs8zGGOGfWyxxLximE8YFOfEK8s4FruR8DtM/UjNj61um+iDuMAFEBDe1bhCXkqiKoCmWjJzg==",
             "dev": true,
             "requires": {
-                "@jest/types": "^25.1.0"
-            }
-        },
-        "jest-pnp-resolver": {
-            "version": "1.2.1",
-            "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.1.tgz",
-            "integrity": "sha512-pgFw2tm54fzgYvc/OHrnysABEObZCUNFnhjoRjaVOCN8NYc032/gVjPaHD4Aq6ApkSieWtfKAFQtmDKAmhupnQ==",
-            "dev": true
-        },
-        "jest-regex-util": {
-            "version": "25.1.0",
-            "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-25.1.0.tgz",
-            "integrity": "sha512-9lShaDmDpqwg+xAd73zHydKrBbbrIi08Kk9YryBEBybQFg/lBWR/2BDjjiSE7KIppM9C5+c03XiDaZ+m4Pgs1w==",
-            "dev": true
-        },
-        "jest-resolve": {
-            "version": "25.1.0",
-            "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-25.1.0.tgz",
-            "integrity": "sha512-XkBQaU1SRCHj2Evz2Lu4Czs+uIgJXWypfO57L7JYccmAXv4slXA6hzNblmcRmf7P3cQ1mE7fL3ABV6jAwk4foQ==",
-            "dev": true,
-            "requires": {
-                "@jest/types": "^25.1.0",
-                "browser-resolve": "^1.11.3",
-                "chalk": "^3.0.0",
-                "jest-pnp-resolver": "^1.2.1",
-                "realpath-native": "^1.1.0"
+                "@jest/types": "^25.2.3"
             },
             "dependencies": {
+                "@jest/types": {
+                    "version": "25.2.3",
+                    "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.2.3.tgz",
+                    "integrity": "sha512-6oLQwO9mKif3Uph3RX5J1i3S7X7xtDHWBaaaoeKw8hOzV6YUd0qDcYcHZ6QXMHDIzSr7zzrEa51o2Ovlj6AtKQ==",
+                    "dev": true,
+                    "requires": {
+                        "@types/istanbul-lib-coverage": "^2.0.0",
+                        "@types/istanbul-reports": "^1.1.1",
+                        "@types/yargs": "^15.0.0",
+                        "chalk": "^3.0.0"
+                    }
+                },
                 "ansi-styles": {
                     "version": "4.2.1",
                     "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
@@ -4756,44 +5601,219 @@
                 }
             }
         },
-        "jest-resolve-dependencies": {
-            "version": "25.1.0",
-            "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-25.1.0.tgz",
-            "integrity": "sha512-Cu/Je38GSsccNy4I2vL12ZnBlD170x2Oh1devzuM9TLH5rrnLW1x51lN8kpZLYTvzx9j+77Y5pqBaTqfdzVzrw==",
+        "jest-pnp-resolver": {
+            "version": "1.2.1",
+            "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.1.tgz",
+            "integrity": "sha512-pgFw2tm54fzgYvc/OHrnysABEObZCUNFnhjoRjaVOCN8NYc032/gVjPaHD4Aq6ApkSieWtfKAFQtmDKAmhupnQ==",
+            "dev": true
+        },
+        "jest-regex-util": {
+            "version": "25.2.1",
+            "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-25.2.1.tgz",
+            "integrity": "sha512-wroFVJw62LdqTdkL508ZLV82FrJJWVJMIuYG7q4Uunl1WAPTf4ftPKrqqfec4SvOIlvRZUdEX2TFpWR356YG/w==",
+            "dev": true
+        },
+        "jest-resolve": {
+            "version": "25.2.3",
+            "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-25.2.3.tgz",
+            "integrity": "sha512-1vZMsvM/DBH258PnpUNSXIgtzpYz+vCVCj9+fcy4akZl4oKbD+9hZSlfe9RIDpU0Fc28ozHQrmwX3EqFRRIHGg==",
             "dev": true,
             "requires": {
-                "@jest/types": "^25.1.0",
-                "jest-regex-util": "^25.1.0",
-                "jest-snapshot": "^25.1.0"
+                "@jest/types": "^25.2.3",
+                "browser-resolve": "^1.11.3",
+                "chalk": "^3.0.0",
+                "jest-pnp-resolver": "^1.2.1",
+                "realpath-native": "^2.0.0",
+                "resolve": "^1.15.1"
+            },
+            "dependencies": {
+                "@jest/types": {
+                    "version": "25.2.3",
+                    "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.2.3.tgz",
+                    "integrity": "sha512-6oLQwO9mKif3Uph3RX5J1i3S7X7xtDHWBaaaoeKw8hOzV6YUd0qDcYcHZ6QXMHDIzSr7zzrEa51o2Ovlj6AtKQ==",
+                    "dev": true,
+                    "requires": {
+                        "@types/istanbul-lib-coverage": "^2.0.0",
+                        "@types/istanbul-reports": "^1.1.1",
+                        "@types/yargs": "^15.0.0",
+                        "chalk": "^3.0.0"
+                    }
+                },
+                "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==",
+                    "dev": true,
+                    "requires": {
+                        "@types/color-name": "^1.1.1",
+                        "color-convert": "^2.0.1"
+                    }
+                },
+                "chalk": {
+                    "version": "3.0.0",
+                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+                    "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+                    "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
+                },
+                "resolve": {
+                    "version": "1.15.1",
+                    "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.15.1.tgz",
+                    "integrity": "sha512-84oo6ZTtoTUpjgNEr5SJyzQhzL72gaRodsSfyxC/AXRvwu0Yse9H8eF9IpGo7b8YetZhlI6v7ZQ6bKBFV/6S7w==",
+                    "dev": true,
+                    "requires": {
+                        "path-parse": "^1.0.6"
+                    }
+                },
+                "supports-color": {
+                    "version": "7.1.0",
+                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+                    "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+                    "dev": true,
+                    "requires": {
+                        "has-flag": "^4.0.0"
+                    }
+                }
+            }
+        },
+        "jest-resolve-dependencies": {
+            "version": "25.2.4",
+            "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-25.2.4.tgz",
+            "integrity": "sha512-qhUnK4PfNHzNdca7Ub1mbAqE0j5WNyMTwxBZZJjQlUrdqsiYho/QGK65FuBkZuSoYtKIIqriR9TpGrPEc3P5Gg==",
+            "dev": true,
+            "requires": {
+                "@jest/types": "^25.2.3",
+                "jest-regex-util": "^25.2.1",
+                "jest-snapshot": "^25.2.4"
+            },
+            "dependencies": {
+                "@jest/types": {
+                    "version": "25.2.3",
+                    "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.2.3.tgz",
+                    "integrity": "sha512-6oLQwO9mKif3Uph3RX5J1i3S7X7xtDHWBaaaoeKw8hOzV6YUd0qDcYcHZ6QXMHDIzSr7zzrEa51o2Ovlj6AtKQ==",
+                    "dev": true,
+                    "requires": {
+                        "@types/istanbul-lib-coverage": "^2.0.0",
+                        "@types/istanbul-reports": "^1.1.1",
+                        "@types/yargs": "^15.0.0",
+                        "chalk": "^3.0.0"
+                    }
+                },
+                "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==",
+                    "dev": true,
+                    "requires": {
+                        "@types/color-name": "^1.1.1",
+                        "color-convert": "^2.0.1"
+                    }
+                },
+                "chalk": {
+                    "version": "3.0.0",
+                    "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+                    "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+                    "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.1.0",
+                    "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+                    "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+                    "dev": true,
+                    "requires": {
+                        "has-flag": "^4.0.0"
+                    }
+                }
             }
         },
         "jest-runner": {
-            "version": "25.1.0",
-            "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-25.1.0.tgz",
-            "integrity": "sha512-su3O5fy0ehwgt+e8Wy7A8CaxxAOCMzL4gUBftSs0Ip32S0epxyZPDov9Znvkl1nhVOJNf4UwAsnqfc3plfQH9w==",
+            "version": "25.2.4",
+            "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-25.2.4.tgz",
+            "integrity": "sha512-5xaIfqqxck9Wg2CV4b9KmJtf/sWO7zWQx7O+34GCLGPzoPcVmB3mZtdrQI1/jS3Reqjru9ycLjgLHSf6XoxRqA==",
             "dev": true,
             "requires": {
-                "@jest/console": "^25.1.0",
-                "@jest/environment": "^25.1.0",
-                "@jest/test-result": "^25.1.0",
-                "@jest/types": "^25.1.0",
+                "@jest/console": "^25.2.3",
+                "@jest/environment": "^25.2.4",
+                "@jest/test-result": "^25.2.4",
+                "@jest/types": "^25.2.3",
                 "chalk": "^3.0.0",
                 "exit": "^0.1.2",
                 "graceful-fs": "^4.2.3",
-                "jest-config": "^25.1.0",
-                "jest-docblock": "^25.1.0",
-                "jest-haste-map": "^25.1.0",
-                "jest-jasmine2": "^25.1.0",
-                "jest-leak-detector": "^25.1.0",
-                "jest-message-util": "^25.1.0",
-                "jest-resolve": "^25.1.0",
-                "jest-runtime": "^25.1.0",
-                "jest-util": "^25.1.0",
-                "jest-worker": "^25.1.0",
+                "jest-config": "^25.2.4",
+                "jest-docblock": "^25.2.3",
+                "jest-haste-map": "^25.2.3",
+                "jest-jasmine2": "^25.2.4",
+                "jest-leak-detector": "^25.2.3",
+                "jest-message-util": "^25.2.4",
+                "jest-resolve": "^25.2.3",
+                "jest-runtime": "^25.2.4",
+                "jest-util": "^25.2.3",
+                "jest-worker": "^25.2.1",
                 "source-map-support": "^0.5.6",
                 "throat": "^5.0.0"
             },
             "dependencies": {
+                "@jest/types": {
+                    "version": "25.2.3",
+                    "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.2.3.tgz",
+                    "integrity": "sha512-6oLQwO9mKif3Uph3RX5J1i3S7X7xtDHWBaaaoeKw8hOzV6YUd0qDcYcHZ6QXMHDIzSr7zzrEa51o2Ovlj6AtKQ==",
+                    "dev": true,
+                    "requires": {
+                        "@types/istanbul-lib-coverage": "^2.0.0",
+                        "@types/istanbul-reports": "^1.1.1",
+                        "@types/yargs": "^15.0.0",
+                        "chalk": "^3.0.0"
+                    }
+                },
                 "ansi-styles": {
                     "version": "4.2.1",
                     "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
@@ -4853,38 +5873,50 @@
             }
         },
         "jest-runtime": {
-            "version": "25.1.0",
-            "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-25.1.0.tgz",
-            "integrity": "sha512-mpPYYEdbExKBIBB16ryF6FLZTc1Rbk9Nx0ryIpIMiDDkOeGa0jQOKVI/QeGvVGlunKKm62ywcioeFVzIbK03bA==",
+            "version": "25.2.4",
+            "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-25.2.4.tgz",
+            "integrity": "sha512-6ehOUizgIghN+aV5YSrDzTZ+zJ9omgEjJbTHj3Jqes5D52XHfhzT7cSfdREwkNjRytrR7mNwZ7pRauoyNLyJ8Q==",
             "dev": true,
             "requires": {
-                "@jest/console": "^25.1.0",
-                "@jest/environment": "^25.1.0",
-                "@jest/source-map": "^25.1.0",
-                "@jest/test-result": "^25.1.0",
-                "@jest/transform": "^25.1.0",
-                "@jest/types": "^25.1.0",
+                "@jest/console": "^25.2.3",
+                "@jest/environment": "^25.2.4",
+                "@jest/source-map": "^25.2.1",
+                "@jest/test-result": "^25.2.4",
+                "@jest/transform": "^25.2.4",
+                "@jest/types": "^25.2.3",
                 "@types/yargs": "^15.0.0",
                 "chalk": "^3.0.0",
                 "collect-v8-coverage": "^1.0.0",
                 "exit": "^0.1.2",
                 "glob": "^7.1.3",
                 "graceful-fs": "^4.2.3",
-                "jest-config": "^25.1.0",
-                "jest-haste-map": "^25.1.0",
-                "jest-message-util": "^25.1.0",
-                "jest-mock": "^25.1.0",
-                "jest-regex-util": "^25.1.0",
-                "jest-resolve": "^25.1.0",
-                "jest-snapshot": "^25.1.0",
-                "jest-util": "^25.1.0",
-                "jest-validate": "^25.1.0",
-                "realpath-native": "^1.1.0",
+                "jest-config": "^25.2.4",
+                "jest-haste-map": "^25.2.3",
+                "jest-message-util": "^25.2.4",
+                "jest-mock": "^25.2.3",
+                "jest-regex-util": "^25.2.1",
+                "jest-resolve": "^25.2.3",
+                "jest-snapshot": "^25.2.4",
+                "jest-util": "^25.2.3",
+                "jest-validate": "^25.2.3",
+                "realpath-native": "^2.0.0",
                 "slash": "^3.0.0",
                 "strip-bom": "^4.0.0",
-                "yargs": "^15.0.0"
+                "yargs": "^15.3.1"
             },
             "dependencies": {
+                "@jest/types": {
+                    "version": "25.2.3",
+                    "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.2.3.tgz",
+                    "integrity": "sha512-6oLQwO9mKif3Uph3RX5J1i3S7X7xtDHWBaaaoeKw8hOzV6YUd0qDcYcHZ6QXMHDIzSr7zzrEa51o2Ovlj6AtKQ==",
+                    "dev": true,
+                    "requires": {
+                        "@types/istanbul-lib-coverage": "^2.0.0",
+                        "@types/istanbul-reports": "^1.1.1",
+                        "@types/yargs": "^15.0.0",
+                        "chalk": "^3.0.0"
+                    }
+                },
                 "ansi-regex": {
                     "version": "5.0.0",
                     "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
@@ -5002,9 +6034,9 @@
                     "dev": true
                 },
                 "yargs": {
-                    "version": "15.1.0",
-                    "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.1.0.tgz",
-                    "integrity": "sha512-T39FNN1b6hCW4SOIk1XyTOWxtXdcen0t+XYrysQmChzSipvhBO8Bj0nK1ozAasdk24dNWuMZvr4k24nz+8HHLg==",
+                    "version": "15.3.1",
+                    "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.3.1.tgz",
+                    "integrity": "sha512-92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA==",
                     "dev": true,
                     "requires": {
                         "cliui": "^6.0.0",
@@ -5017,38 +6049,67 @@
                         "string-width": "^4.2.0",
                         "which-module": "^2.0.0",
                         "y18n": "^4.0.0",
-                        "yargs-parser": "^16.1.0"
+                        "yargs-parser": "^18.1.1"
+                    }
+                },
+                "yargs-parser": {
+                    "version": "18.1.2",
+                    "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.2.tgz",
+                    "integrity": "sha512-hlIPNR3IzC1YuL1c2UwwDKpXlNFBqD1Fswwh1khz5+d8Cq/8yc/Mn0i+rQXduu8hcrFKvO7Eryk+09NecTQAAQ==",
+                    "dev": true,
+                    "requires": {
+                        "camelcase": "^5.0.0",
+                        "decamelize": "^1.2.0"
                     }
                 }
             }
         },
         "jest-serializer": {
-            "version": "25.1.0",
-            "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-25.1.0.tgz",
-            "integrity": "sha512-20Wkq5j7o84kssBwvyuJ7Xhn7hdPeTXndnwIblKDR2/sy1SUm6rWWiG9kSCgJPIfkDScJCIsTtOKdlzfIHOfKA==",
+            "version": "25.2.1",
+            "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-25.2.1.tgz",
+            "integrity": "sha512-fibDi7M5ffx6c/P66IkvR4FKkjG5ldePAK1WlbNoaU4GZmIAkS9Le/frAwRUFEX0KdnisSPWf+b1RC5jU7EYJQ==",
             "dev": true
         },
         "jest-snapshot": {
-            "version": "25.1.0",
-            "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-25.1.0.tgz",
-            "integrity": "sha512-xZ73dFYN8b/+X2hKLXz4VpBZGIAn7muD/DAg+pXtDzDGw3iIV10jM7WiHqhCcpDZfGiKEj7/2HXAEPtHTj0P2A==",
+            "version": "25.2.4",
+            "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-25.2.4.tgz",
+            "integrity": "sha512-nIwpW7FZCq5p0AE3Oyqyb6jL0ENJixXzJ5/CD/XRuOqp3gS5OM3O/k+NnTrniCXxPFV4ry6s9HNfiPQBi0wcoA==",
             "dev": true,
             "requires": {
                 "@babel/types": "^7.0.0",
-                "@jest/types": "^25.1.0",
+                "@jest/types": "^25.2.3",
+                "@types/prettier": "^1.19.0",
                 "chalk": "^3.0.0",
-                "expect": "^25.1.0",
-                "jest-diff": "^25.1.0",
-                "jest-get-type": "^25.1.0",
-                "jest-matcher-utils": "^25.1.0",
-                "jest-message-util": "^25.1.0",
-                "jest-resolve": "^25.1.0",
-                "mkdirp": "^0.5.1",
+                "expect": "^25.2.4",
+                "jest-diff": "^25.2.3",
+                "jest-get-type": "^25.2.1",
+                "jest-matcher-utils": "^25.2.3",
+                "jest-message-util": "^25.2.4",
+                "jest-resolve": "^25.2.3",
+                "make-dir": "^3.0.0",
                 "natural-compare": "^1.4.0",
-                "pretty-format": "^25.1.0",
-                "semver": "^7.1.1"
+                "pretty-format": "^25.2.3",
+                "semver": "^6.3.0"
             },
             "dependencies": {
+                "@jest/types": {
+                    "version": "25.2.3",
+                    "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.2.3.tgz",
+                    "integrity": "sha512-6oLQwO9mKif3Uph3RX5J1i3S7X7xtDHWBaaaoeKw8hOzV6YUd0qDcYcHZ6QXMHDIzSr7zzrEa51o2Ovlj6AtKQ==",
+                    "dev": true,
+                    "requires": {
+                        "@types/istanbul-lib-coverage": "^2.0.0",
+                        "@types/istanbul-reports": "^1.1.1",
+                        "@types/yargs": "^15.0.0",
+                        "chalk": "^3.0.0"
+                    }
+                },
+                "ansi-regex": {
+                    "version": "5.0.0",
+                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+                    "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+                    "dev": true
+                },
                 "ansi-styles": {
                     "version": "4.2.1",
                     "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
@@ -5084,16 +6145,52 @@
                     "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
                     "dev": true
                 },
+                "diff-sequences": {
+                    "version": "25.2.1",
+                    "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-25.2.1.tgz",
+                    "integrity": "sha512-foe7dXnGlSh3jR1ovJmdv+77VQj98eKCHHwJPbZ2eEf0fHwKbkZicpPxEch9smZ+n2dnF6QFwkOQdLq9hpeJUg==",
+                    "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
                 },
+                "jest-diff": {
+                    "version": "25.2.3",
+                    "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-25.2.3.tgz",
+                    "integrity": "sha512-VtZ6LAQtaQpFsmEzps15dQc5ELbJxy4L2DOSo2Ev411TUEtnJPkAMD7JneVypeMJQ1y3hgxN9Ao13n15FAnavg==",
+                    "dev": true,
+                    "requires": {
+                        "chalk": "^3.0.0",
+                        "diff-sequences": "^25.2.1",
+                        "jest-get-type": "^25.2.1",
+                        "pretty-format": "^25.2.3"
+                    }
+                },
+                "jest-get-type": {
+                    "version": "25.2.1",
+                    "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-25.2.1.tgz",
+                    "integrity": "sha512-EYjTiqcDTCRJDcSNKbLTwn/LcDPEE7ITk8yRMNAOjEsN6yp+Uu+V1gx4djwnuj/DvWg0YGmqaBqPVGsPxlvE7w==",
+                    "dev": true
+                },
+                "pretty-format": {
+                    "version": "25.2.3",
+                    "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.2.3.tgz",
+                    "integrity": "sha512-IP4+5UOAVGoyqC/DiomOeHBUKN6q00gfyT2qpAsRH64tgOKB2yF7FHJXC18OCiU0/YFierACup/zdCOWw0F/0w==",
+                    "dev": true,
+                    "requires": {
+                        "@jest/types": "^25.2.3",
+                        "ansi-regex": "^5.0.0",
+                        "ansi-styles": "^4.0.0",
+                        "react-is": "^16.12.0"
+                    }
+                },
                 "semver": {
-                    "version": "7.1.3",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-7.1.3.tgz",
-                    "integrity": "sha512-ekM0zfiA9SCBlsKa2X1hxyxiI4L3B6EbVJkkdgQXnSEEaHlGdvyodMruTiulSRWMMB4NeIuYNMC9rTKTz97GxA==",
+                    "version": "6.3.0",
+                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
                     "dev": true
                 },
                 "supports-color": {
@@ -5108,17 +6205,29 @@
             }
         },
         "jest-util": {
-            "version": "25.1.0",
-            "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-25.1.0.tgz",
-            "integrity": "sha512-7did6pLQ++87Qsj26Fs/TIwZMUFBXQ+4XXSodRNy3luch2DnRXsSnmpVtxxQ0Yd6WTipGpbhh2IFP1mq6/fQGw==",
+            "version": "25.2.3",
+            "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-25.2.3.tgz",
+            "integrity": "sha512-7tWiMICVSo9lNoObFtqLt9Ezt5exdFlWs5fLe1G4XLY2lEbZc814cw9t4YHScqBkWMfzth8ASHKlYBxiX2rdCw==",
             "dev": true,
             "requires": {
-                "@jest/types": "^25.1.0",
+                "@jest/types": "^25.2.3",
                 "chalk": "^3.0.0",
                 "is-ci": "^2.0.0",
-                "mkdirp": "^0.5.1"
+                "make-dir": "^3.0.0"
             },
             "dependencies": {
+                "@jest/types": {
+                    "version": "25.2.3",
+                    "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.2.3.tgz",
+                    "integrity": "sha512-6oLQwO9mKif3Uph3RX5J1i3S7X7xtDHWBaaaoeKw8hOzV6YUd0qDcYcHZ6QXMHDIzSr7zzrEa51o2Ovlj6AtKQ==",
+                    "dev": true,
+                    "requires": {
+                        "@types/istanbul-lib-coverage": "^2.0.0",
+                        "@types/istanbul-reports": "^1.1.1",
+                        "@types/yargs": "^15.0.0",
+                        "chalk": "^3.0.0"
+                    }
+                },
                 "ansi-styles": {
                     "version": "4.2.1",
                     "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
@@ -5172,19 +6281,37 @@
             }
         },
         "jest-validate": {
-            "version": "25.1.0",
-            "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-25.1.0.tgz",
-            "integrity": "sha512-kGbZq1f02/zVO2+t1KQGSVoCTERc5XeObLwITqC6BTRH3Adv7NZdYqCpKIZLUgpLXf2yISzQ465qOZpul8abXA==",
+            "version": "25.2.3",
+            "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-25.2.3.tgz",
+            "integrity": "sha512-GObn91jzU0B0Bv4cusAwjP6vnWy78hJUM8MOSz7keRfnac/ZhQWIsUjvk01IfeXNTemCwgR57EtdjQMzFZGREg==",
             "dev": true,
             "requires": {
-                "@jest/types": "^25.1.0",
+                "@jest/types": "^25.2.3",
                 "camelcase": "^5.3.1",
                 "chalk": "^3.0.0",
-                "jest-get-type": "^25.1.0",
+                "jest-get-type": "^25.2.1",
                 "leven": "^3.1.0",
-                "pretty-format": "^25.1.0"
+                "pretty-format": "^25.2.3"
             },
             "dependencies": {
+                "@jest/types": {
+                    "version": "25.2.3",
+                    "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.2.3.tgz",
+                    "integrity": "sha512-6oLQwO9mKif3Uph3RX5J1i3S7X7xtDHWBaaaoeKw8hOzV6YUd0qDcYcHZ6QXMHDIzSr7zzrEa51o2Ovlj6AtKQ==",
+                    "dev": true,
+                    "requires": {
+                        "@types/istanbul-lib-coverage": "^2.0.0",
+                        "@types/istanbul-reports": "^1.1.1",
+                        "@types/yargs": "^15.0.0",
+                        "chalk": "^3.0.0"
+                    }
+                },
+                "ansi-regex": {
+                    "version": "5.0.0",
+                    "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+                    "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+                    "dev": true
+                },
                 "ansi-styles": {
                     "version": "4.2.1",
                     "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
@@ -5226,6 +6353,24 @@
                     "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
                     "dev": true
                 },
+                "jest-get-type": {
+                    "version": "25.2.1",
+                    "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-25.2.1.tgz",
+                    "integrity": "sha512-EYjTiqcDTCRJDcSNKbLTwn/LcDPEE7ITk8yRMNAOjEsN6yp+Uu+V1gx4djwnuj/DvWg0YGmqaBqPVGsPxlvE7w==",
+                    "dev": true
+                },
+                "pretty-format": {
+                    "version": "25.2.3",
+                    "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.2.3.tgz",
+                    "integrity": "sha512-IP4+5UOAVGoyqC/DiomOeHBUKN6q00gfyT2qpAsRH64tgOKB2yF7FHJXC18OCiU0/YFierACup/zdCOWw0F/0w==",
+                    "dev": true,
+                    "requires": {
+                        "@jest/types": "^25.2.3",
+                        "ansi-regex": "^5.0.0",
+                        "ansi-styles": "^4.0.0",
+                        "react-is": "^16.12.0"
+                    }
+                },
                 "supports-color": {
                     "version": "7.1.0",
                     "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
@@ -5238,19 +6383,31 @@
             }
         },
         "jest-watcher": {
-            "version": "25.1.0",
-            "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-25.1.0.tgz",
-            "integrity": "sha512-Q9eZ7pyaIr6xfU24OeTg4z1fUqBF/4MP6J801lyQfg7CsnZ/TCzAPvCfckKdL5dlBBEKBeHV0AdyjFZ5eWj4ig==",
+            "version": "25.2.4",
+            "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-25.2.4.tgz",
+            "integrity": "sha512-p7g7s3zqcy69slVzQYcphyzkB2FBmJwMbv6k6KjI5mqd6KnUnQPfQVKuVj2l+34EeuxnbXqnrjtUFmxhcL87rg==",
             "dev": true,
             "requires": {
-                "@jest/test-result": "^25.1.0",
-                "@jest/types": "^25.1.0",
+                "@jest/test-result": "^25.2.4",
+                "@jest/types": "^25.2.3",
                 "ansi-escapes": "^4.2.1",
                 "chalk": "^3.0.0",
-                "jest-util": "^25.1.0",
+                "jest-util": "^25.2.3",
                 "string-length": "^3.1.0"
             },
             "dependencies": {
+                "@jest/types": {
+                    "version": "25.2.3",
+                    "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.2.3.tgz",
+                    "integrity": "sha512-6oLQwO9mKif3Uph3RX5J1i3S7X7xtDHWBaaaoeKw8hOzV6YUd0qDcYcHZ6QXMHDIzSr7zzrEa51o2Ovlj6AtKQ==",
+                    "dev": true,
+                    "requires": {
+                        "@types/istanbul-lib-coverage": "^2.0.0",
+                        "@types/istanbul-reports": "^1.1.1",
+                        "@types/yargs": "^15.0.0",
+                        "chalk": "^3.0.0"
+                    }
+                },
                 "ansi-styles": {
                     "version": "4.2.1",
                     "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
@@ -5304,9 +6461,9 @@
             }
         },
         "jest-worker": {
-            "version": "25.1.0",
-            "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-25.1.0.tgz",
-            "integrity": "sha512-ZHhHtlxOWSxCoNOKHGbiLzXnl42ga9CxDr27H36Qn+15pQZd3R/F24jrmjDelw9j/iHUIWMWs08/u2QN50HHOg==",
+            "version": "25.2.1",
+            "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-25.2.1.tgz",
+            "integrity": "sha512-IHnpekk8H/hCUbBlfeaPZzU6v75bqwJp3n4dUrQuQOAgOneI4tx3jV2o8pvlXnDfcRsfkFIUD//HWXpCmR+evQ==",
             "dev": true,
             "requires": {
                 "merge-stream": "^2.0.0",
@@ -6158,18 +7315,6 @@
                 }
             }
         },
-        "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==",
-            "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-visit": {
             "version": "1.0.1",
             "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz",
@@ -6179,28 +7324,6 @@
                 "isobject": "^3.0.0"
             }
         },
-        "object.assign": {
-            "version": "4.1.0",
-            "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.0.tgz",
-            "integrity": "sha512-exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w==",
-            "dev": true,
-            "requires": {
-                "define-properties": "^1.1.2",
-                "function-bind": "^1.1.1",
-                "has-symbols": "^1.0.0",
-                "object-keys": "^1.0.11"
-            }
-        },
-        "object.getownpropertydescriptors": {
-            "version": "2.1.0",
-            "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.0.tgz",
-            "integrity": "sha512-Z53Oah9A3TdLoblT7VKJaTDdXdT+lQO+cNpKVnya5JDe9uLvzu1YyY1yFDFrcxrlRgWrEFH0jJtD/IbuwjcEVg==",
-            "dev": true,
-            "requires": {
-                "define-properties": "^1.1.3",
-                "es-abstract": "^1.17.0-next.1"
-            }
-        },
         "object.pick": {
             "version": "1.3.0",
             "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz",
@@ -6400,9 +7523,9 @@
             "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns="
         },
         "picomatch": {
-            "version": "2.2.1",
-            "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.1.tgz",
-            "integrity": "sha512-ISBaA8xQNmwELC7eOjqFKMESB2VIqt4PPDD0nsS95b/9dZXvVKOlz9keMSnoGGKcOHXfTvDD6WMaRoSc9UuhRA==",
+            "version": "2.2.2",
+            "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz",
+            "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==",
             "dev": true
         },
         "pirates": {
@@ -6742,9 +7865,9 @@
             "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="
         },
         "prompts": {
-            "version": "2.3.1",
-            "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.3.1.tgz",
-            "integrity": "sha512-qIP2lQyCwYbdzcqHIUi2HAxiWixhoM9OdLCWf8txXsapC/X9YdsCoeyRIXE/GP+Q0J37Q7+XN/MFqbUa7IzXNA==",
+            "version": "2.3.2",
+            "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.3.2.tgz",
+            "integrity": "sha512-Q06uKs2CkNYVID0VqwfAl9mipo99zkBv/n2JtWY89Yxa3ZabWSrs0e2KTudKVa3peLUvYXMefDqIleLPVUBZMA==",
             "dev": true,
             "requires": {
                 "kleur": "^3.0.3",
@@ -6814,13 +7937,10 @@
             }
         },
         "realpath-native": {
-            "version": "1.1.0",
-            "resolved": "https://registry.npmjs.org/realpath-native/-/realpath-native-1.1.0.tgz",
-            "integrity": "sha512-wlgPA6cCIIg9gKz0fgAPjnzh4yR/LnXovwuo9hvyGvx3h8nX4+/iLZplfUWasXpqD8BdnGnP5njOFjkUwPzvjA==",
-            "dev": true,
-            "requires": {
-                "util.promisify": "^1.0.0"
-            }
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/realpath-native/-/realpath-native-2.0.0.tgz",
+            "integrity": "sha512-v1SEYUOXXdbBZK8ZuNgO4TBjamPsiSgcFr0aP+tEKpQZK8vooEUqV6nm6Cv502mX4NF2EfsnVqtNAHG+/6Ur1Q==",
+            "dev": true
         },
         "rechoir": {
             "version": "0.6.2",
@@ -7162,9 +8282,9 @@
                     }
                 },
                 "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==",
                     "dev": true
                 },
                 "normalize-path": {
@@ -7322,9 +8442,9 @@
             "dev": true
         },
         "sisteransi": {
-            "version": "1.0.4",
-            "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.4.tgz",
-            "integrity": "sha512-/ekMoM4NJ59ivGSfKapeG+FWtrmWvA1p6FBZwXrqojw90vJu8lBmrTxCMuBCydKtkaUe2zt4PlxeTKpjwMbyig==",
+            "version": "1.0.5",
+            "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
+            "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
             "dev": true
         },
         "slash": {
@@ -7605,26 +8725,6 @@
                 "strip-ansi": "^3.0.0"
             }
         },
-        "string.prototype.trimleft": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz",
-            "integrity": "sha512-iu2AGd3PuP5Rp7x2kEZCrB2Nf41ehzh+goo8TV7z8/XDBbsvc6HQIlUl9RjkZ4oyrW1XM5UwlGl1oVEaDjg6Ag==",
-            "dev": true,
-            "requires": {
-                "define-properties": "^1.1.3",
-                "function-bind": "^1.1.1"
-            }
-        },
-        "string.prototype.trimright": {
-            "version": "2.1.1",
-            "resolved": "https://registry.npmjs.org/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz",
-            "integrity": "sha512-qFvWL3/+QIgZXVmJBfpHmxLB7xsUXz6HsUmP8+5dRaC3Q7oKUv9Vo6aMCRZC1smrtyECFsIT30PqBJ1gTjAs+g==",
-            "dev": true,
-            "requires": {
-                "define-properties": "^1.1.3",
-                "function-bind": "^1.1.1"
-            }
-        },
         "string_decoder": {
             "version": "1.1.1",
             "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
@@ -8041,9 +9141,9 @@
             "integrity": "sha1-cXuPIgzAu3tE5AUUwisui7xw2Lk="
         },
         "ts-jest": {
-            "version": "25.2.1",
-            "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-25.2.1.tgz",
-            "integrity": "sha512-TnntkEEjuXq/Gxpw7xToarmHbAafgCaAzOpnajnFC6jI7oo1trMzAHA04eWpc3MhV6+yvhE8uUBAmN+teRJh0A==",
+            "version": "25.3.0",
+            "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-25.3.0.tgz",
+            "integrity": "sha512-qH/uhaC+AFDU9JfAueSr0epIFJkGMvUPog4FxSEVAtPOur1Oni5WBJMiQIkfHvc7PviVRsnlVLLY2I6221CQew==",
             "dev": true,
             "requires": {
                 "bs-logger": "0.x",
@@ -8052,17 +9152,33 @@
                 "json5": "2.x",
                 "lodash.memoize": "4.x",
                 "make-error": "1.x",
-                "mkdirp": "0.x",
+                "mkdirp": "1.x",
                 "resolve": "1.x",
-                "semver": "^5.5",
-                "yargs-parser": "^16.1.0"
+                "semver": "6.x",
+                "yargs-parser": "^18.1.1"
             },
             "dependencies": {
-                "semver": {
-                    "version": "5.7.1",
-                    "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz",
-                    "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==",
+                "mkdirp": {
+                    "version": "1.0.3",
+                    "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.3.tgz",
+                    "integrity": "sha512-6uCP4Qc0sWsgMLy1EOqqS/3rjDHOEnsStVr/4vtAIK2Y5i2kA7lFFejYrpIyiN9w0pYf4ckeCYT9f1r1P9KX5g==",
                     "dev": true
+                },
+                "semver": {
+                    "version": "6.3.0",
+                    "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+                    "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+                    "dev": true
+                },
+                "yargs-parser": {
+                    "version": "18.1.2",
+                    "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.2.tgz",
+                    "integrity": "sha512-hlIPNR3IzC1YuL1c2UwwDKpXlNFBqD1Fswwh1khz5+d8Cq/8yc/Mn0i+rQXduu8hcrFKvO7Eryk+09NecTQAAQ==",
+                    "dev": true,
+                    "requires": {
+                        "camelcase": "^5.0.0",
+                        "decamelize": "^1.2.0"
+                    }
                 }
             }
         },
@@ -8324,18 +9440,6 @@
             "integrity": "sha1-p8IW0mdUUWljeztu3GypEZ4v+T8=",
             "dev": true
         },
-        "util.promisify": {
-            "version": "1.0.1",
-            "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.1.tgz",
-            "integrity": "sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==",
-            "dev": true,
-            "requires": {
-                "define-properties": "^1.1.3",
-                "es-abstract": "^1.17.2",
-                "has-symbols": "^1.0.1",
-                "object.getownpropertydescriptors": "^2.1.0"
-            }
-        },
         "uuid": {
             "version": "3.3.3",
             "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.3.3.tgz",
@@ -8348,9 +9452,9 @@
             "dev": true
         },
         "v8-to-istanbul": {
-            "version": "4.1.2",
-            "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-4.1.2.tgz",
-            "integrity": "sha512-G9R+Hpw0ITAmPSr47lSlc5A1uekSYzXxTMlFxso2xoffwo4jQnzbv1p9yXIinO8UMZKfAFewaCHwWvnH4Jb4Ug==",
+            "version": "4.1.3",
+            "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-4.1.3.tgz",
+            "integrity": "sha512-sAjOC+Kki6aJVbUOXJbcR0MnbfjvBzwKZazEJymA2IX49uoOdEdk+4fBq5cXgYgiyKtAyrrJNtBZdOeDIF+Fng==",
             "dev": true,
             "requires": {
                 "@types/istanbul-lib-coverage": "^2.0.1",
@@ -8517,9 +9621,9 @@
             }
         },
         "ws": {
-            "version": "7.2.1",
-            "resolved": "https://registry.npmjs.org/ws/-/ws-7.2.1.tgz",
-            "integrity": "sha512-sucePNSafamSKoOqoNfBd8V0StlkzJKL2ZAhGQinCfNQ+oacw+Pk7lcdAElecBF2VkLNZRiIb5Oi1Q5lVUVt2A==",
+            "version": "7.2.3",
+            "resolved": "https://registry.npmjs.org/ws/-/ws-7.2.3.tgz",
+            "integrity": "sha512-HTDl9G9hbkNDk98naoR/cHDws7+EyYMOdL1BmjsZXRUjf7d+MficC4B7HLUPlSiho0vg+CWKrGIt/VJBd1xunQ==",
             "dev": true
         },
         "xml-name-validator": {
@@ -8579,16 +9683,6 @@
                     "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8="
                 }
             }
-        },
-        "yargs-parser": {
-            "version": "16.1.0",
-            "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-16.1.0.tgz",
-            "integrity": "sha512-H/V41UNZQPkUMIT5h5hiwg4QKIY1RPvoBV4XcjUbRM8Bk2oKqqyZ0DIEbTFZB0XjbtSPG8SAa/0DxCQmiRgzKg==",
-            "dev": true,
-            "requires": {
-                "camelcase": "^5.0.0",
-                "decamelize": "^1.2.0"
-            }
         }
     }
 }
diff --git a/src/cpp/include/nodegui/QtWidgets/QBoxLayout/qboxlayout_wrap.h b/src/cpp/include/nodegui/QtWidgets/QBoxLayout/qboxlayout_wrap.h
index b84a85bde..09a6646f7 100644
--- a/src/cpp/include/nodegui/QtWidgets/QBoxLayout/qboxlayout_wrap.h
+++ b/src/cpp/include/nodegui/QtWidgets/QBoxLayout/qboxlayout_wrap.h
@@ -30,6 +30,10 @@ class DLL_EXPORT QBoxLayoutWrap : public Napi::ObjectWrap<QBoxLayoutWrap> {
   Napi::Value insertWidget(const Napi::CallbackInfo& info);
   Napi::Value direction(const Napi::CallbackInfo& info);
   Napi::Value insertLayout(const Napi::CallbackInfo& info);
+  Napi::Value insertSpacing(const Napi::CallbackInfo& info);
+  Napi::Value insertStretch(const Napi::CallbackInfo& info);
   Napi::Value removeWidget(const Napi::CallbackInfo& info);
   Napi::Value setDirection(const Napi::CallbackInfo& info);
+  Napi::Value setStretch(const Napi::CallbackInfo& info);
+  Napi::Value count(const Napi::CallbackInfo& info);
 };
diff --git a/src/cpp/include/nodegui/QtWidgets/QLayout/qlayout_macro.h b/src/cpp/include/nodegui/QtWidgets/QLayout/qlayout_macro.h
index abcfc3b7b..26067cd80 100644
--- a/src/cpp/include/nodegui/QtWidgets/QLayout/qlayout_macro.h
+++ b/src/cpp/include/nodegui/QtWidgets/QLayout/qlayout_macro.h
@@ -12,26 +12,49 @@
  */
 
 #ifndef QLAYOUT_WRAPPED_METHODS_DECLARATION
-#define QLAYOUT_WRAPPED_METHODS_DECLARATION                \
-  QOBJECT_WRAPPED_METHODS_DECLARATION                      \
-                                                           \
-  Napi::Value activate(const Napi::CallbackInfo& info) {   \
-    Napi::Env env = info.Env();                            \
-    Napi::HandleScope scope(env);                          \
-    bool wasRedone = this->instance->activate();           \
-    return Napi::Boolean::New(env, wasRedone);             \
-  }                                                        \
-  Napi::Value invalidate(const Napi::CallbackInfo& info) { \
-    Napi::Env env = info.Env();                            \
-    Napi::HandleScope scope(env);                          \
-    this->instance->invalidate();                          \
-    return env.Null();                                     \
-  }                                                        \
-  Napi::Value update(const Napi::CallbackInfo& info) {     \
-    Napi::Env env = info.Env();                            \
-    Napi::HandleScope scope(env);                          \
-    this->instance->update();                              \
-    return env.Null();                                     \
+#define QLAYOUT_WRAPPED_METHODS_DECLARATION                        \
+  QOBJECT_WRAPPED_METHODS_DECLARATION                              \
+                                                                   \
+  Napi::Value activate(const Napi::CallbackInfo& info) {           \
+    Napi::Env env = info.Env();                                    \
+    Napi::HandleScope scope(env);                                  \
+    bool wasRedone = this->instance->activate();                   \
+    return Napi::Boolean::New(env, wasRedone);                     \
+  }                                                                \
+  Napi::Value setEnabled(const Napi::CallbackInfo& info) {         \
+    Napi::Env env = info.Env();                                    \
+    Napi::HandleScope scope(env);                                  \
+    bool enable = info[0].As<Napi::Boolean>().Value();             \
+    this->instance->setEnabled(enable);                            \
+    return env.Null();                                             \
+  }                                                                \
+  Napi::Value isEnabled(const Napi::CallbackInfo& info) {          \
+    Napi::Env env = info.Env();                                    \
+    Napi::HandleScope scope(env);                                  \
+    bool enabled = this->instance->isEnabled();                    \
+    return Napi::Boolean::New(env, enabled);                       \
+  }                                                                \
+  Napi::Value setContentsMargins(const Napi::CallbackInfo& info) { \
+    Napi::Env env = info.Env();                                    \
+    Napi::HandleScope scope(env);                                  \
+    int left = info[0].As<Napi::Number>().Int32Value();            \
+    int top = info[1].As<Napi::Number>().Int32Value();             \
+    int right = info[2].As<Napi::Number>().Int32Value();           \
+    int bottom = info[3].As<Napi::Number>().Int32Value();          \
+    this->instance->setContentsMargins(left, top, right, bottom);  \
+    return env.Null();                                             \
+  }                                                                \
+  Napi::Value invalidate(const Napi::CallbackInfo& info) {         \
+    Napi::Env env = info.Env();                                    \
+    Napi::HandleScope scope(env);                                  \
+    this->instance->invalidate();                                  \
+    return env.Null();                                             \
+  }                                                                \
+  Napi::Value update(const Napi::CallbackInfo& info) {             \
+    Napi::Env env = info.Env();                                    \
+    Napi::HandleScope scope(env);                                  \
+    this->instance->update();                                      \
+    return env.Null();                                             \
   }
 
 #endif  // QLAYOUT_WRAPPED_METHODS_DECLARATION
@@ -41,6 +64,10 @@
                                                                  \
   QOBJECT_WRAPPED_METHODS_EXPORT_DEFINE(LayoutWrapName)          \
   InstanceMethod("activate", &LayoutWrapName::activate),         \
+      InstanceMethod("setEnabled", &LayoutWrapName::setEnabled), \
+      InstanceMethod("isEnabled", &LayoutWrapName::isEnabled),   \
+      InstanceMethod("setContentsMargins",                       \
+                     &LayoutWrapName::setContentsMargins),       \
       InstanceMethod("invalidate", &LayoutWrapName::invalidate), \
       InstanceMethod("update", &LayoutWrapName::update),
 
diff --git a/src/cpp/include/nodegui/QtWidgets/QTreeWidget/qtreewidget_wrap.h b/src/cpp/include/nodegui/QtWidgets/QTreeWidget/qtreewidget_wrap.h
index 3d6df17ed..000f410fc 100644
--- a/src/cpp/include/nodegui/QtWidgets/QTreeWidget/qtreewidget_wrap.h
+++ b/src/cpp/include/nodegui/QtWidgets/QTreeWidget/qtreewidget_wrap.h
@@ -36,10 +36,9 @@ class DLL_EXPORT QTreeWidgetWrap : public Napi::ObjectWrap<QTreeWidgetWrap> {
   Napi::Value setItemWidget(const Napi::CallbackInfo &info);
   Napi::Value currentItem(const Napi::CallbackInfo &info);
   Napi::Value findItems(const Napi::CallbackInfo &info);
+  Napi::Value takeTopLevelItem(const Napi::CallbackInfo &info);
+  Napi::Value clear(const Napi::CallbackInfo &info);
 
-  // Napi::Value addTopLevelItems(const Napi::CallbackInfo& info);
   // Napi::Value setHorizontalScrollBarPolicy(const Napi::CallbackInfo& info);
   // Napi::Value setVerticalScrollBarPolicy(const Napi::CallbackInfo& info);
-  // Napi::Value takeTopLevelItem(const Napi::CallbackInfo& info);
-  // Napi::Value findItems(const Napi::CallbackInfo& info);
 };
diff --git a/src/cpp/include/nodegui/QtWidgets/QWidget/qwidget_macro.h b/src/cpp/include/nodegui/QtWidgets/QWidget/qwidget_macro.h
index edb6ea8a0..f26798705 100644
--- a/src/cpp/include/nodegui/QtWidgets/QWidget/qwidget_macro.h
+++ b/src/cpp/include/nodegui/QtWidgets/QWidget/qwidget_macro.h
@@ -4,6 +4,7 @@
 #include <QStyle>
 
 #include "QtCore/QObject/qobject_macro.h"
+#include "QtCore/QPoint/qpoint_wrap.h"
 #include "QtCore/QSize/qsize_wrap.h"
 #include "QtGui/QIcon/qicon_wrap.h"
 #include "QtWidgets/QAction/qaction_wrap.h"
@@ -17,322 +18,364 @@
  */
 
 #ifndef QWIDGET_WRAPPED_METHODS_DECLARATION
-#define QWIDGET_WRAPPED_METHODS_DECLARATION                                 \
-                                                                            \
-  QOBJECT_WRAPPED_METHODS_DECLARATION                                       \
-  YOGAWIDGET_WRAPPED_METHODS_DECLARATION                                    \
-                                                                            \
-  Napi::Value show(const Napi::CallbackInfo& info) {                        \
-    Napi::Env env = info.Env();                                             \
-    Napi::HandleScope scope(env);                                           \
-    this->instance->show();                                                 \
-    return env.Null();                                                      \
-  }                                                                         \
-  Napi::Value resize(const Napi::CallbackInfo& info) {                      \
-    Napi::Env env = info.Env();                                             \
-    Napi::HandleScope scope(env);                                           \
-    Napi::Number width = info[0].As<Napi::Number>();                        \
-    Napi::Number height = info[1].As<Napi::Number>();                       \
-    this->instance->resize(width.Int32Value(), height.Int32Value());        \
-    return env.Null();                                                      \
-  }                                                                         \
-  Napi::Value close(const Napi::CallbackInfo& info) {                       \
-    Napi::Env env = info.Env();                                             \
-    Napi::HandleScope scope(env);                                           \
-    bool hasClosed = this->instance->close();                               \
-    return Napi::Boolean::New(env, hasClosed);                              \
-  }                                                                         \
-  Napi::Value isVisible(const Napi::CallbackInfo& info) {                   \
-    Napi::Env env = info.Env();                                             \
-    Napi::HandleScope scope(env);                                           \
-    bool isVisible = this->instance->isVisible();                           \
-    return Napi::Boolean::New(env, isVisible);                              \
-  }                                                                         \
-                                                                            \
-  Napi::Value setLayout(const Napi::CallbackInfo& info) {                   \
-    Napi::Env env = info.Env();                                             \
-    Napi::HandleScope scope(env);                                           \
-    Napi::Object layoutObject = info[0].As<Napi::Object>();                 \
-    QLayoutWrap* layoutWrap =                                               \
-        Napi::ObjectWrap<QLayoutWrap>::Unwrap(layoutObject);                \
-    this->instance->setLayout(layoutWrap->getInternalInstance());           \
-    return env.Null();                                                      \
-  }                                                                         \
-                                                                            \
-  Napi::Value setStyleSheet(const Napi::CallbackInfo& info) {               \
-    Napi::Env env = info.Env();                                             \
-    Napi::HandleScope scope(env);                                           \
-    Napi::String text = info[0].As<Napi::String>();                         \
-    std::string style = text.Utf8Value();                                   \
-    QString newStyle = QString::fromStdString(style);                       \
-    QString currentStyleSheet = this->instance->styleSheet();               \
-    if (newStyle != currentStyleSheet) {                                    \
-      this->instance->setStyleSheet(newStyle);                              \
-    }                                                                       \
-    return env.Null();                                                      \
-  }                                                                         \
-  Napi::Value setCursor(const Napi::CallbackInfo& info) {                   \
-    Napi::Env env = info.Env();                                             \
-    Napi::HandleScope scope(env);                                           \
-    Napi::Number cursor = info[0].As<Napi::Number>();                       \
-    this->instance->setCursor(                                              \
-        static_cast<Qt::CursorShape>(cursor.Int32Value()));                 \
-    return env.Null();                                                      \
-  }                                                                         \
-  Napi::Value setWindowIcon(const Napi::CallbackInfo& info) {               \
-    Napi::Env env = info.Env();                                             \
-    Napi::HandleScope scope(env);                                           \
-    Napi::Object iconObject = info[0].As<Napi::Object>();                   \
-    QIconWrap* iconWrap = Napi::ObjectWrap<QIconWrap>::Unwrap(iconObject);  \
-    this->instance->setWindowIcon(*iconWrap->getInternalInstance());        \
-    return env.Null();                                                      \
-  }                                                                         \
-  Napi::Value setWindowState(const Napi::CallbackInfo& info) {              \
-    Napi::Env env = info.Env();                                             \
-    Napi::HandleScope scope(env);                                           \
-    Napi::Number state = info[0].As<Napi::Number>();                        \
-    this->instance->setWindowState(                                         \
-        static_cast<Qt::WindowState>(state.Int32Value()));                  \
-    return env.Null();                                                      \
-  }                                                                         \
-  Napi::Value windowState(const Napi::CallbackInfo& info) {                 \
-    Napi::Env env = info.Env();                                             \
-    Napi::HandleScope scope(env);                                           \
-    int state = static_cast<int>(this->instance->windowState());            \
-    return Napi::Value::From(env, state);                                   \
-  }                                                                         \
-  Napi::Value setWindowTitle(const Napi::CallbackInfo& info) {              \
-    Napi::Env env = info.Env();                                             \
-    Napi::HandleScope scope(env);                                           \
-    Napi::String napiTitle = info[0].As<Napi::String>();                    \
-    std::string title = napiTitle.Utf8Value();                              \
-    this->instance->setWindowTitle(title.c_str());                          \
-    return env.Null();                                                      \
-  }                                                                         \
-  Napi::Value windowTitle(const Napi::CallbackInfo& info) {                 \
-    Napi::Env env = info.Env();                                             \
-    Napi::HandleScope scope(env);                                           \
-    QString title = this->instance->windowTitle();                          \
-    return Napi::String::New(env, title.toStdString());                     \
-  }                                                                         \
-  Napi::Value styleSheet(const Napi::CallbackInfo& info) {                  \
-    Napi::Env env = info.Env();                                             \
-    Napi::HandleScope scope(env);                                           \
-    QString stylesheet = this->instance->styleSheet();                      \
-    return Napi::String::New(env, stylesheet.toStdString());                \
-  }                                                                         \
-  Napi::Value hide(const Napi::CallbackInfo& info) {                        \
-    Napi::Env env = info.Env();                                             \
-    Napi::HandleScope scope(env);                                           \
-    this->instance->hide();                                                 \
-    return env.Null();                                                      \
-  }                                                                         \
-  Napi::Value move(const Napi::CallbackInfo& info) {                        \
-    Napi::Env env = info.Env();                                             \
-    Napi::HandleScope scope(env);                                           \
-    int x = info[0].As<Napi::Number>().Int32Value();                        \
-    int y = info[1].As<Napi::Number>().Int32Value();                        \
-    this->instance->move(x, y);                                             \
-    return env.Null();                                                      \
-  }                                                                         \
-                                                                            \
-  Napi::Value setMouseTracking(const Napi::CallbackInfo& info) {            \
-    Napi::Env env = info.Env();                                             \
-    Napi::HandleScope scope(env);                                           \
-    Napi::Boolean isMouseTracked = info[0].As<Napi::Boolean>();             \
-    this->instance->setMouseTracking(isMouseTracked.Value());               \
-    return env.Null();                                                      \
-  }                                                                         \
-  Napi::Value hasMouseTracking(const Napi::CallbackInfo& info) {            \
-    Napi::Env env = info.Env();                                             \
-    Napi::HandleScope scope(env);                                           \
-    bool isMouseTracked = this->instance->hasMouseTracking();               \
-    return Napi::Value::From(env, isMouseTracked);                          \
-  }                                                                         \
-  Napi::Value setEnabled(const Napi::CallbackInfo& info) {                  \
-    Napi::Env env = info.Env();                                             \
-    Napi::HandleScope scope(env);                                           \
-    Napi::Boolean enabled = info[0].As<Napi::Boolean>();                    \
-    this->instance->setEnabled(enabled.Value());                            \
-    return env.Null();                                                      \
-  }                                                                         \
-  Napi::Value isEnabled(const Napi::CallbackInfo& info) {                   \
-    Napi::Env env = info.Env();                                             \
-    Napi::HandleScope scope(env);                                           \
-    bool enabled = this->instance->isEnabled();                             \
-    return Napi::Value::From(env, enabled);                                 \
-  }                                                                         \
-  Napi::Value setFixedSize(const Napi::CallbackInfo& info) {                \
-    Napi::Env env = info.Env();                                             \
-    Napi::HandleScope scope(env);                                           \
-    int width = info[0].As<Napi::Number>().Int32Value();                    \
-    int height = info[1].As<Napi::Number>().Int32Value();                   \
-    this->instance->setFixedSize(width, height);                            \
-    return env.Null();                                                      \
-  }                                                                         \
-  Napi::Value setGeometry(const Napi::CallbackInfo& info) {                 \
-    Napi::Env env = info.Env();                                             \
-    Napi::HandleScope scope(env);                                           \
-    int x = info[0].As<Napi::Number>().Int32Value();                        \
-    int y = info[1].As<Napi::Number>().Int32Value();                        \
-    int width = info[2].As<Napi::Number>().Int32Value();                    \
-    int height = info[3].As<Napi::Number>().Int32Value();                   \
-    this->instance->setGeometry(x, y, width, height);                       \
-    return env.Null();                                                      \
-  }                                                                         \
-  Napi::Value setMaximumSize(const Napi::CallbackInfo& info) {              \
-    Napi::Env env = info.Env();                                             \
-    Napi::HandleScope scope(env);                                           \
-    int width = info[0].As<Napi::Number>().Int32Value();                    \
-    int height = info[1].As<Napi::Number>().Int32Value();                   \
-    this->instance->setMaximumSize(width, height);                          \
-    return env.Null();                                                      \
-  }                                                                         \
-  Napi::Value setMinimumSize(const Napi::CallbackInfo& info) {              \
-    Napi::Env env = info.Env();                                             \
-    Napi::HandleScope scope(env);                                           \
-    int width = info[0].As<Napi::Number>().Int32Value();                    \
-    int height = info[1].As<Napi::Number>().Int32Value();                   \
-    this->instance->setMinimumSize(width, height);                          \
-    return env.Null();                                                      \
-  }                                                                         \
-  Napi::Value repaint(const Napi::CallbackInfo& info) {                     \
-    Napi::Env env = info.Env();                                             \
-    Napi::HandleScope scope(env);                                           \
-    this->instance->repaint();                                              \
-    return env.Null();                                                      \
-  }                                                                         \
-  Napi::Value update(const Napi::CallbackInfo& info) {                      \
-    Napi::Env env = info.Env();                                             \
-    Napi::HandleScope scope(env);                                           \
-    this->instance->update();                                               \
-    return env.Null();                                                      \
-  }                                                                         \
-  Napi::Value updateGeometry(const Napi::CallbackInfo& info) {              \
-    Napi::Env env = info.Env();                                             \
-    Napi::HandleScope scope(env);                                           \
-    this->instance->updateGeometry();                                       \
-    return env.Null();                                                      \
-  }                                                                         \
-  Napi::Value pos(const Napi::CallbackInfo& info) {                         \
-    Napi::Env env = info.Env();                                             \
-    Napi::HandleScope scope(env);                                           \
-    QPoint pos = this->instance->pos();                                     \
-    Napi::Object posObj = Napi::Object::New(env);                           \
-    posObj.Set("x", pos.x());                                               \
-    posObj.Set("y", pos.y());                                               \
-    return posObj;                                                          \
-  }                                                                         \
-  Napi::Value size(const Napi::CallbackInfo& info) {                        \
-    Napi::Env env = info.Env();                                             \
-    Napi::HandleScope scope(env);                                           \
-    QSize size = this->instance->size();                                    \
-    auto sizeWrap = QSizeWrap::constructor.New({Napi::External<QSize>::New( \
-        env, new QSize(size.width(), size.height()))});                     \
-    return sizeWrap;                                                        \
-  }                                                                         \
-  Napi::Value setAttribute(const Napi::CallbackInfo& info) {                \
-    Napi::Env env = info.Env();                                             \
-    Napi::HandleScope scope(env);                                           \
-    int attributeId = info[0].As<Napi::Number>().Int32Value();              \
-    bool switchOn = info[1].As<Napi::Boolean>().Value();                    \
-    this->instance->setAttribute(                                           \
-        static_cast<Qt::WidgetAttribute>(attributeId), switchOn);           \
-    return env.Null();                                                      \
-  }                                                                         \
-  Napi::Value testAttribute(const Napi::CallbackInfo& info) {               \
-    Napi::Env env = info.Env();                                             \
-    Napi::HandleScope scope(env);                                           \
-    int attributeId = info[0].As<Napi::Number>().Int32Value();              \
-    bool isOn = this->instance->testAttribute(                              \
-        static_cast<Qt::WidgetAttribute>(attributeId));                     \
-    return Napi::Boolean::New(env, isOn);                                   \
-  }                                                                         \
-  Napi::Value setWindowOpacity(const Napi::CallbackInfo& info) {            \
-    Napi::Env env = info.Env();                                             \
-    Napi::HandleScope scope(env);                                           \
-    float opacity = info[0].As<Napi::Number>().FloatValue();                \
-    this->instance->setWindowOpacity(opacity);                              \
-    return env.Null();                                                      \
-  }                                                                         \
-  Napi::Value windowOpacity(const Napi::CallbackInfo& info) {               \
-    Napi::Env env = info.Env();                                             \
-    Napi::HandleScope scope(env);                                           \
-    float opacity = this->instance->windowOpacity();                        \
-    return Napi::Value::From(env, opacity);                                 \
-  }                                                                         \
-  Napi::Value setWindowFlag(const Napi::CallbackInfo& info) {               \
-    Napi::Env env = info.Env();                                             \
-    Napi::HandleScope scope(env);                                           \
-    int windowType = info[0].As<Napi::Number>().Int32Value();               \
-    bool switchOn = info[1].As<Napi::Boolean>().Value();                    \
-    this->instance->setWindowFlag(static_cast<Qt::WindowType>(windowType),  \
-                                  switchOn);                                \
-    return env.Null();                                                      \
-  }                                                                         \
-  Napi::Value adjustSize(const Napi::CallbackInfo& info) {                  \
-    Napi::Env env = info.Env();                                             \
-    Napi::HandleScope scope(env);                                           \
-    this->instance->adjustSize();                                           \
-    return env.Null();                                                      \
-  }                                                                         \
-  Napi::Value activateWindow(const Napi::CallbackInfo& info) {              \
-    Napi::Env env = info.Env();                                             \
-    Napi::HandleScope scope(env);                                           \
-    this->instance->activateWindow();                                       \
-    return env.Null();                                                      \
-  }                                                                         \
-  Napi::Value raise(const Napi::CallbackInfo& info) {                       \
-    Napi::Env env = info.Env();                                             \
-    Napi::HandleScope scope(env);                                           \
-    this->instance->raise();                                                \
-    return env.Null();                                                      \
-  }                                                                         \
-  Napi::Value lower(const Napi::CallbackInfo& info) {                       \
-    Napi::Env env = info.Env();                                             \
-    Napi::HandleScope scope(env);                                           \
-    this->instance->lower();                                                \
-    return env.Null();                                                      \
-  }                                                                         \
-  Napi::Value showFullScreen(const Napi::CallbackInfo& info) {              \
-    Napi::Env env = info.Env();                                             \
-    Napi::HandleScope scope(env);                                           \
-    this->instance->showFullScreen();                                       \
-    return env.Null();                                                      \
-  }                                                                         \
-  Napi::Value showMaximized(const Napi::CallbackInfo& info) {               \
-    Napi::Env env = info.Env();                                             \
-    Napi::HandleScope scope(env);                                           \
-    this->instance->showMaximized();                                        \
-    return env.Null();                                                      \
-  }                                                                         \
-  Napi::Value showMinimized(const Napi::CallbackInfo& info) {               \
-    Napi::Env env = info.Env();                                             \
-    Napi::HandleScope scope(env);                                           \
-    this->instance->showMinimized();                                        \
-    return env.Null();                                                      \
-  }                                                                         \
-  Napi::Value showNormal(const Napi::CallbackInfo& info) {                  \
-    Napi::Env env = info.Env();                                             \
-    Napi::HandleScope scope(env);                                           \
-    this->instance->showNormal();                                           \
-    return env.Null();                                                      \
-  }                                                                         \
-  Napi::Value addAction(const Napi::CallbackInfo& info) {                   \
-    Napi::Env env = info.Env();                                             \
-    Napi::HandleScope scope(env);                                           \
-    Napi::Object actionObject = info[0].As<Napi::Object>();                 \
-    QActionWrap* actionWrap =                                               \
-        Napi::ObjectWrap<QActionWrap>::Unwrap(actionObject);                \
-    this->instance->addAction(actionWrap->getInternalInstance());           \
-    return env.Null();                                                      \
-  }                                                                         \
-  Napi::Value repolish(const Napi::CallbackInfo& info) {                    \
-    Napi::Env env = info.Env();                                             \
-    Napi::HandleScope scope(env);                                           \
-    this->instance->style()->unpolish(this->instance);                      \
-    this->instance->style()->polish(this->instance);                        \
-    return env.Null();                                                      \
+#define QWIDGET_WRAPPED_METHODS_DECLARATION                                   \
+                                                                              \
+  QOBJECT_WRAPPED_METHODS_DECLARATION                                         \
+  YOGAWIDGET_WRAPPED_METHODS_DECLARATION                                      \
+                                                                              \
+  Napi::Value show(const Napi::CallbackInfo& info) {                          \
+    Napi::Env env = info.Env();                                               \
+    Napi::HandleScope scope(env);                                             \
+    this->instance->show();                                                   \
+    return env.Null();                                                        \
+  }                                                                           \
+  Napi::Value resize(const Napi::CallbackInfo& info) {                        \
+    Napi::Env env = info.Env();                                               \
+    Napi::HandleScope scope(env);                                             \
+    Napi::Number width = info[0].As<Napi::Number>();                          \
+    Napi::Number height = info[1].As<Napi::Number>();                         \
+    this->instance->resize(width.Int32Value(), height.Int32Value());          \
+    return env.Null();                                                        \
+  }                                                                           \
+  Napi::Value close(const Napi::CallbackInfo& info) {                         \
+    Napi::Env env = info.Env();                                               \
+    Napi::HandleScope scope(env);                                             \
+    bool hasClosed = this->instance->close();                                 \
+    return Napi::Boolean::New(env, hasClosed);                                \
+  }                                                                           \
+  Napi::Value mapFromGlobal(const Napi::CallbackInfo& info) {                 \
+    Napi::Env env = info.Env();                                               \
+    Napi::HandleScope scope(env);                                             \
+    Napi::Object posObject = info[0].As<Napi::Object>();                      \
+    QPointWrap* posWrap = Napi::ObjectWrap<QPointWrap>::Unwrap(posObject);    \
+    QPoint pt =                                                               \
+        this->instance->mapFromGlobal(*posWrap->getInternalInstance());       \
+    auto instance = QPointWrap::constructor.New(                              \
+        {Napi::External<QPoint>::New(env, new QPoint(pt.x(), pt.y()))});      \
+    return instance;                                                          \
+  }                                                                           \
+  Napi::Value mapFromParent(const Napi::CallbackInfo& info) {                 \
+    Napi::Env env = info.Env();                                               \
+    Napi::HandleScope scope(env);                                             \
+    Napi::Object posObject = info[0].As<Napi::Object>();                      \
+    QPointWrap* posWrap = Napi::ObjectWrap<QPointWrap>::Unwrap(posObject);    \
+    QPoint pt =                                                               \
+        this->instance->mapFromParent(*posWrap->getInternalInstance());       \
+    auto instance = QPointWrap::constructor.New(                              \
+        {Napi::External<QPoint>::New(env, new QPoint(pt.x(), pt.y()))});      \
+    return instance;                                                          \
+  }                                                                           \
+  Napi::Value mapToGlobal(const Napi::CallbackInfo& info) {                   \
+    Napi::Env env = info.Env();                                               \
+    Napi::HandleScope scope(env);                                             \
+    Napi::Object posObject = info[0].As<Napi::Object>();                      \
+    QPointWrap* posWrap = Napi::ObjectWrap<QPointWrap>::Unwrap(posObject);    \
+    QPoint pt = this->instance->mapToGlobal(*posWrap->getInternalInstance()); \
+    auto instance = QPointWrap::constructor.New(                              \
+        {Napi::External<QPoint>::New(env, new QPoint(pt.x(), pt.y()))});      \
+    return instance;                                                          \
+  }                                                                           \
+  Napi::Value mapToParent(const Napi::CallbackInfo& info) {                   \
+    Napi::Env env = info.Env();                                               \
+    Napi::HandleScope scope(env);                                             \
+    Napi::Object posObject = info[0].As<Napi::Object>();                      \
+    QPointWrap* posWrap = Napi::ObjectWrap<QPointWrap>::Unwrap(posObject);    \
+    QPoint pt = this->instance->mapToParent(*posWrap->getInternalInstance()); \
+    auto instance = QPointWrap::constructor.New(                              \
+        {Napi::External<QPoint>::New(env, new QPoint(pt.x(), pt.y()))});      \
+    return instance;                                                          \
+  }                                                                           \
+  Napi::Value isVisible(const Napi::CallbackInfo& info) {                     \
+    Napi::Env env = info.Env();                                               \
+    Napi::HandleScope scope(env);                                             \
+    bool isVisible = this->instance->isVisible();                             \
+    return Napi::Boolean::New(env, isVisible);                                \
+  }                                                                           \
+                                                                              \
+  Napi::Value setLayout(const Napi::CallbackInfo& info) {                     \
+    Napi::Env env = info.Env();                                               \
+    Napi::HandleScope scope(env);                                             \
+    Napi::Object layoutObject = info[0].As<Napi::Object>();                   \
+    QLayoutWrap* layoutWrap =                                                 \
+        Napi::ObjectWrap<QLayoutWrap>::Unwrap(layoutObject);                  \
+    this->instance->setLayout(layoutWrap->getInternalInstance());             \
+    return env.Null();                                                        \
+  }                                                                           \
+                                                                              \
+  Napi::Value setStyleSheet(const Napi::CallbackInfo& info) {                 \
+    Napi::Env env = info.Env();                                               \
+    Napi::HandleScope scope(env);                                             \
+    Napi::String text = info[0].As<Napi::String>();                           \
+    std::string style = text.Utf8Value();                                     \
+    QString newStyle = QString::fromStdString(style);                         \
+    QString currentStyleSheet = this->instance->styleSheet();                 \
+    if (newStyle != currentStyleSheet) {                                      \
+      this->instance->setStyleSheet(newStyle);                                \
+    }                                                                         \
+    return env.Null();                                                        \
+  }                                                                           \
+  Napi::Value setCursor(const Napi::CallbackInfo& info) {                     \
+    Napi::Env env = info.Env();                                               \
+    Napi::HandleScope scope(env);                                             \
+    Napi::Number cursor = info[0].As<Napi::Number>();                         \
+    this->instance->setCursor(                                                \
+        static_cast<Qt::CursorShape>(cursor.Int32Value()));                   \
+    return env.Null();                                                        \
+  }                                                                           \
+  Napi::Value setWindowIcon(const Napi::CallbackInfo& info) {                 \
+    Napi::Env env = info.Env();                                               \
+    Napi::HandleScope scope(env);                                             \
+    Napi::Object iconObject = info[0].As<Napi::Object>();                     \
+    QIconWrap* iconWrap = Napi::ObjectWrap<QIconWrap>::Unwrap(iconObject);    \
+    this->instance->setWindowIcon(*iconWrap->getInternalInstance());          \
+    return env.Null();                                                        \
+  }                                                                           \
+  Napi::Value setWindowState(const Napi::CallbackInfo& info) {                \
+    Napi::Env env = info.Env();                                               \
+    Napi::HandleScope scope(env);                                             \
+    Napi::Number state = info[0].As<Napi::Number>();                          \
+    this->instance->setWindowState(                                           \
+        static_cast<Qt::WindowState>(state.Int32Value()));                    \
+    return env.Null();                                                        \
+  }                                                                           \
+  Napi::Value windowState(const Napi::CallbackInfo& info) {                   \
+    Napi::Env env = info.Env();                                               \
+    Napi::HandleScope scope(env);                                             \
+    int state = static_cast<int>(this->instance->windowState());              \
+    return Napi::Value::From(env, state);                                     \
+  }                                                                           \
+  Napi::Value setWindowTitle(const Napi::CallbackInfo& info) {                \
+    Napi::Env env = info.Env();                                               \
+    Napi::HandleScope scope(env);                                             \
+    Napi::String napiTitle = info[0].As<Napi::String>();                      \
+    std::string title = napiTitle.Utf8Value();                                \
+    this->instance->setWindowTitle(title.c_str());                            \
+    return env.Null();                                                        \
+  }                                                                           \
+  Napi::Value windowTitle(const Napi::CallbackInfo& info) {                   \
+    Napi::Env env = info.Env();                                               \
+    Napi::HandleScope scope(env);                                             \
+    QString title = this->instance->windowTitle();                            \
+    return Napi::String::New(env, title.toStdString());                       \
+  }                                                                           \
+  Napi::Value styleSheet(const Napi::CallbackInfo& info) {                    \
+    Napi::Env env = info.Env();                                               \
+    Napi::HandleScope scope(env);                                             \
+    QString stylesheet = this->instance->styleSheet();                        \
+    return Napi::String::New(env, stylesheet.toStdString());                  \
+  }                                                                           \
+  Napi::Value hide(const Napi::CallbackInfo& info) {                          \
+    Napi::Env env = info.Env();                                               \
+    Napi::HandleScope scope(env);                                             \
+    this->instance->hide();                                                   \
+    return env.Null();                                                        \
+  }                                                                           \
+  Napi::Value move(const Napi::CallbackInfo& info) {                          \
+    Napi::Env env = info.Env();                                               \
+    Napi::HandleScope scope(env);                                             \
+    int x = info[0].As<Napi::Number>().Int32Value();                          \
+    int y = info[1].As<Napi::Number>().Int32Value();                          \
+    this->instance->move(x, y);                                               \
+    return env.Null();                                                        \
+  }                                                                           \
+                                                                              \
+  Napi::Value setMouseTracking(const Napi::CallbackInfo& info) {              \
+    Napi::Env env = info.Env();                                               \
+    Napi::HandleScope scope(env);                                             \
+    Napi::Boolean isMouseTracked = info[0].As<Napi::Boolean>();               \
+    this->instance->setMouseTracking(isMouseTracked.Value());                 \
+    return env.Null();                                                        \
+  }                                                                           \
+  Napi::Value hasMouseTracking(const Napi::CallbackInfo& info) {              \
+    Napi::Env env = info.Env();                                               \
+    Napi::HandleScope scope(env);                                             \
+    bool isMouseTracked = this->instance->hasMouseTracking();                 \
+    return Napi::Value::From(env, isMouseTracked);                            \
+  }                                                                           \
+  Napi::Value setEnabled(const Napi::CallbackInfo& info) {                    \
+    Napi::Env env = info.Env();                                               \
+    Napi::HandleScope scope(env);                                             \
+    Napi::Boolean enabled = info[0].As<Napi::Boolean>();                      \
+    this->instance->setEnabled(enabled.Value());                              \
+    return env.Null();                                                        \
+  }                                                                           \
+  Napi::Value isEnabled(const Napi::CallbackInfo& info) {                     \
+    Napi::Env env = info.Env();                                               \
+    Napi::HandleScope scope(env);                                             \
+    bool enabled = this->instance->isEnabled();                               \
+    return Napi::Value::From(env, enabled);                                   \
+  }                                                                           \
+  Napi::Value setFixedSize(const Napi::CallbackInfo& info) {                  \
+    Napi::Env env = info.Env();                                               \
+    Napi::HandleScope scope(env);                                             \
+    int width = info[0].As<Napi::Number>().Int32Value();                      \
+    int height = info[1].As<Napi::Number>().Int32Value();                     \
+    this->instance->setFixedSize(width, height);                              \
+    return env.Null();                                                        \
+  }                                                                           \
+  Napi::Value setGeometry(const Napi::CallbackInfo& info) {                   \
+    Napi::Env env = info.Env();                                               \
+    Napi::HandleScope scope(env);                                             \
+    int x = info[0].As<Napi::Number>().Int32Value();                          \
+    int y = info[1].As<Napi::Number>().Int32Value();                          \
+    int width = info[2].As<Napi::Number>().Int32Value();                      \
+    int height = info[3].As<Napi::Number>().Int32Value();                     \
+    this->instance->setGeometry(x, y, width, height);                         \
+    return env.Null();                                                        \
+  }                                                                           \
+  Napi::Value setMaximumSize(const Napi::CallbackInfo& info) {                \
+    Napi::Env env = info.Env();                                               \
+    Napi::HandleScope scope(env);                                             \
+    int width = info[0].As<Napi::Number>().Int32Value();                      \
+    int height = info[1].As<Napi::Number>().Int32Value();                     \
+    this->instance->setMaximumSize(width, height);                            \
+    return env.Null();                                                        \
+  }                                                                           \
+  Napi::Value setMinimumSize(const Napi::CallbackInfo& info) {                \
+    Napi::Env env = info.Env();                                               \
+    Napi::HandleScope scope(env);                                             \
+    int width = info[0].As<Napi::Number>().Int32Value();                      \
+    int height = info[1].As<Napi::Number>().Int32Value();                     \
+    this->instance->setMinimumSize(width, height);                            \
+    return env.Null();                                                        \
+  }                                                                           \
+  Napi::Value repaint(const Napi::CallbackInfo& info) {                       \
+    Napi::Env env = info.Env();                                               \
+    Napi::HandleScope scope(env);                                             \
+    this->instance->repaint();                                                \
+    return env.Null();                                                        \
+  }                                                                           \
+  Napi::Value update(const Napi::CallbackInfo& info) {                        \
+    Napi::Env env = info.Env();                                               \
+    Napi::HandleScope scope(env);                                             \
+    this->instance->update();                                                 \
+    return env.Null();                                                        \
+  }                                                                           \
+  Napi::Value updateGeometry(const Napi::CallbackInfo& info) {                \
+    Napi::Env env = info.Env();                                               \
+    Napi::HandleScope scope(env);                                             \
+    this->instance->updateGeometry();                                         \
+    return env.Null();                                                        \
+  }                                                                           \
+  Napi::Value pos(const Napi::CallbackInfo& info) {                           \
+    Napi::Env env = info.Env();                                               \
+    Napi::HandleScope scope(env);                                             \
+    QPoint pos = this->instance->pos();                                       \
+    Napi::Object posObj = Napi::Object::New(env);                             \
+    posObj.Set("x", pos.x());                                                 \
+    posObj.Set("y", pos.y());                                                 \
+    return posObj;                                                            \
+  }                                                                           \
+  Napi::Value size(const Napi::CallbackInfo& info) {                          \
+    Napi::Env env = info.Env();                                               \
+    Napi::HandleScope scope(env);                                             \
+    QSize size = this->instance->size();                                      \
+    auto sizeWrap = QSizeWrap::constructor.New({Napi::External<QSize>::New(   \
+        env, new QSize(size.width(), size.height()))});                       \
+    return sizeWrap;                                                          \
+  }                                                                           \
+  Napi::Value setAttribute(const Napi::CallbackInfo& info) {                  \
+    Napi::Env env = info.Env();                                               \
+    Napi::HandleScope scope(env);                                             \
+    int attributeId = info[0].As<Napi::Number>().Int32Value();                \
+    bool switchOn = info[1].As<Napi::Boolean>().Value();                      \
+    this->instance->setAttribute(                                             \
+        static_cast<Qt::WidgetAttribute>(attributeId), switchOn);             \
+    return env.Null();                                                        \
+  }                                                                           \
+  Napi::Value testAttribute(const Napi::CallbackInfo& info) {                 \
+    Napi::Env env = info.Env();                                               \
+    Napi::HandleScope scope(env);                                             \
+    int attributeId = info[0].As<Napi::Number>().Int32Value();                \
+    bool isOn = this->instance->testAttribute(                                \
+        static_cast<Qt::WidgetAttribute>(attributeId));                       \
+    return Napi::Boolean::New(env, isOn);                                     \
+  }                                                                           \
+  Napi::Value setWindowOpacity(const Napi::CallbackInfo& info) {              \
+    Napi::Env env = info.Env();                                               \
+    Napi::HandleScope scope(env);                                             \
+    float opacity = info[0].As<Napi::Number>().FloatValue();                  \
+    this->instance->setWindowOpacity(opacity);                                \
+    return env.Null();                                                        \
+  }                                                                           \
+  Napi::Value windowOpacity(const Napi::CallbackInfo& info) {                 \
+    Napi::Env env = info.Env();                                               \
+    Napi::HandleScope scope(env);                                             \
+    float opacity = this->instance->windowOpacity();                          \
+    return Napi::Value::From(env, opacity);                                   \
+  }                                                                           \
+  Napi::Value setWindowFlag(const Napi::CallbackInfo& info) {                 \
+    Napi::Env env = info.Env();                                               \
+    Napi::HandleScope scope(env);                                             \
+    int windowType = info[0].As<Napi::Number>().Int32Value();                 \
+    bool switchOn = info[1].As<Napi::Boolean>().Value();                      \
+    this->instance->setWindowFlag(static_cast<Qt::WindowType>(windowType),    \
+                                  switchOn);                                  \
+    return env.Null();                                                        \
+  }                                                                           \
+  Napi::Value adjustSize(const Napi::CallbackInfo& info) {                    \
+    Napi::Env env = info.Env();                                               \
+    Napi::HandleScope scope(env);                                             \
+    this->instance->adjustSize();                                             \
+    return env.Null();                                                        \
+  }                                                                           \
+  Napi::Value activateWindow(const Napi::CallbackInfo& info) {                \
+    Napi::Env env = info.Env();                                               \
+    Napi::HandleScope scope(env);                                             \
+    this->instance->activateWindow();                                         \
+    return env.Null();                                                        \
+  }                                                                           \
+  Napi::Value raise(const Napi::CallbackInfo& info) {                         \
+    Napi::Env env = info.Env();                                               \
+    Napi::HandleScope scope(env);                                             \
+    this->instance->raise();                                                  \
+    return env.Null();                                                        \
+  }                                                                           \
+  Napi::Value lower(const Napi::CallbackInfo& info) {                         \
+    Napi::Env env = info.Env();                                               \
+    Napi::HandleScope scope(env);                                             \
+    this->instance->lower();                                                  \
+    return env.Null();                                                        \
+  }                                                                           \
+  Napi::Value showFullScreen(const Napi::CallbackInfo& info) {                \
+    Napi::Env env = info.Env();                                               \
+    Napi::HandleScope scope(env);                                             \
+    this->instance->showFullScreen();                                         \
+    return env.Null();                                                        \
+  }                                                                           \
+  Napi::Value showMaximized(const Napi::CallbackInfo& info) {                 \
+    Napi::Env env = info.Env();                                               \
+    Napi::HandleScope scope(env);                                             \
+    this->instance->showMaximized();                                          \
+    return env.Null();                                                        \
+  }                                                                           \
+  Napi::Value showMinimized(const Napi::CallbackInfo& info) {                 \
+    Napi::Env env = info.Env();                                               \
+    Napi::HandleScope scope(env);                                             \
+    this->instance->showMinimized();                                          \
+    return env.Null();                                                        \
+  }                                                                           \
+  Napi::Value showNormal(const Napi::CallbackInfo& info) {                    \
+    Napi::Env env = info.Env();                                               \
+    Napi::HandleScope scope(env);                                             \
+    this->instance->showNormal();                                             \
+    return env.Null();                                                        \
+  }                                                                           \
+  Napi::Value addAction(const Napi::CallbackInfo& info) {                     \
+    Napi::Env env = info.Env();                                               \
+    Napi::HandleScope scope(env);                                             \
+    Napi::Object actionObject = info[0].As<Napi::Object>();                   \
+    QActionWrap* actionWrap =                                                 \
+        Napi::ObjectWrap<QActionWrap>::Unwrap(actionObject);                  \
+    this->instance->addAction(actionWrap->getInternalInstance());             \
+    return env.Null();                                                        \
+  }                                                                           \
+  Napi::Value repolish(const Napi::CallbackInfo& info) {                      \
+    Napi::Env env = info.Env();                                               \
+    Napi::HandleScope scope(env);                                             \
+    this->instance->style()->unpolish(this->instance);                        \
+    this->instance->style()->polish(this->instance);                          \
+    return env.Null();                                                        \
   }
 
 #endif  // QWIDGET_WRAPPED_METHODS_DECLARATION
@@ -346,6 +389,10 @@
       InstanceMethod("resize", &WidgetWrapName::resize),                     \
       InstanceMethod("isVisible", &WidgetWrapName::isVisible),               \
       InstanceMethod("close", &WidgetWrapName::close),                       \
+      InstanceMethod("mapFromGlobal", &WidgetWrapName::mapFromGlobal),       \
+      InstanceMethod("mapFromParent", &WidgetWrapName::mapFromParent),       \
+      InstanceMethod("mapToGlobal", &WidgetWrapName::mapToGlobal),           \
+      InstanceMethod("mapToParent", &WidgetWrapName::mapToParent),           \
       InstanceMethod("setLayout", &WidgetWrapName::setLayout),               \
       InstanceMethod("setStyleSheet", &WidgetWrapName::setStyleSheet),       \
       InstanceMethod("setCursor", &WidgetWrapName::setCursor),               \
diff --git a/src/cpp/lib/QtWidgets/QBoxLayout/qboxlayout_wrap.cpp b/src/cpp/lib/QtWidgets/QBoxLayout/qboxlayout_wrap.cpp
index f04977bde..8d8fb069e 100644
--- a/src/cpp/lib/QtWidgets/QBoxLayout/qboxlayout_wrap.cpp
+++ b/src/cpp/lib/QtWidgets/QBoxLayout/qboxlayout_wrap.cpp
@@ -18,8 +18,12 @@ Napi::Object QBoxLayoutWrap::init(Napi::Env env, Napi::Object exports) {
        InstanceMethod("insertWidget", &QBoxLayoutWrap::insertWidget),
        InstanceMethod("direction", &QBoxLayoutWrap::direction),
        InstanceMethod("insertLayout", &QBoxLayoutWrap::insertLayout),
+       InstanceMethod("insertSpacing", &QBoxLayoutWrap::insertSpacing),
+       InstanceMethod("insertStretch", &QBoxLayoutWrap::insertStretch),
        InstanceMethod("removeWidget", &QBoxLayoutWrap::removeWidget),
        InstanceMethod("setDirection", &QBoxLayoutWrap::setDirection),
+       InstanceMethod("setStretch", &QBoxLayoutWrap::setStretch),
+       InstanceMethod("count", &QBoxLayoutWrap::count),
        QLAYOUT_WRAPPED_METHODS_EXPORT_DEFINE(QBoxLayoutWrap)});
   constructor = Napi::Persistent(func);
   exports.Set(CLASSNAME, func);
@@ -131,6 +135,26 @@ Napi::Value QBoxLayoutWrap::insertLayout(const Napi::CallbackInfo& info) {
   return env.Null();
 }
 
+Napi::Value QBoxLayoutWrap::insertSpacing(const Napi::CallbackInfo& info) {
+  Napi::Env env = info.Env();
+  Napi::HandleScope scope(env);
+
+  int index = info[0].As<Napi::Number>().Int32Value();
+  int size = info[1].As<Napi::Number>().Int32Value();
+  this->instance->insertSpacing(index, size);
+  return env.Null();
+}
+
+Napi::Value QBoxLayoutWrap::insertStretch(const Napi::CallbackInfo& info) {
+  Napi::Env env = info.Env();
+  Napi::HandleScope scope(env);
+
+  int index = info[0].As<Napi::Number>().Int32Value();
+  int stretch = info[1].As<Napi::Number>().Int32Value();
+  this->instance->insertStretch(index, stretch);
+  return env.Null();
+}
+
 Napi::Value QBoxLayoutWrap::removeWidget(const Napi::CallbackInfo& info) {
   Napi::Env env = info.Env();
   Napi::HandleScope scope(env);
@@ -149,4 +173,22 @@ Napi::Value QBoxLayoutWrap::setDirection(const Napi::CallbackInfo& info) {
       info[0].As<Napi::Number>().Int32Value());
   this->instance->setDirection(dir);
   return env.Null();
-}
\ No newline at end of file
+}
+
+Napi::Value QBoxLayoutWrap::setStretch(const Napi::CallbackInfo& info) {
+  Napi::Env env = info.Env();
+  Napi::HandleScope scope(env);
+
+  int index = info[0].As<Napi::Number>().Int32Value();
+  int stretch = info[1].As<Napi::Number>().Int32Value();
+  this->instance->setStretch(index, stretch);
+  return env.Null();
+}
+
+Napi::Value QBoxLayoutWrap::count(const Napi::CallbackInfo& info) {
+  Napi::Env env = info.Env();
+  Napi::HandleScope scope(env);
+
+  int count = this->instance->count();
+  return Napi::Number::New(env, count);
+}
diff --git a/src/cpp/lib/QtWidgets/QMenu/qmenu_wrap.cpp b/src/cpp/lib/QtWidgets/QMenu/qmenu_wrap.cpp
index ddfd57fe9..082300b6e 100644
--- a/src/cpp/lib/QtWidgets/QMenu/qmenu_wrap.cpp
+++ b/src/cpp/lib/QtWidgets/QMenu/qmenu_wrap.cpp
@@ -73,22 +73,24 @@ Napi::Value QMenuWrap::exec(const Napi::CallbackInfo& info) {
   Napi::Env env = info.Env();
   Napi::HandleScope scope(env);
 
-  if (info.Length() == 2) {
+  if (info.Length() > 0) {
     Napi::Object pointObject = info[0].As<Napi::Object>();
     QPointWrap* pointWrap = Napi::ObjectWrap<QPointWrap>::Unwrap(pointObject);
-    QPoint* qpoint = pointWrap->getInternalInstance();
 
-    Napi::Object actionObject = info[1].As<Napi::Object>();
-    QActionWrap* actionWrap =
-        Napi::ObjectWrap<QActionWrap>::Unwrap(actionObject);
-    this->instance->exec(*qpoint, actionWrap->getInternalInstance());
+    QAction* action = nullptr;
+    if (info.Length() == 2) {
+      Napi::Object actionObject = info[1].As<Napi::Object>();
+      QActionWrap* actionWrap =
+          Napi::ObjectWrap<QActionWrap>::Unwrap(actionObject);
+      action = actionWrap->getInternalInstance();
+    }
+    this->instance->exec(*pointWrap->getInternalInstance(), action);
   } else if (info.Length() == 0) {
     this->instance->exec();
   } else {
     Napi::TypeError::New(env, "Wrong number of arguments")
         .ThrowAsJavaScriptException();
   }
-
   return env.Null();
 }
 
diff --git a/src/cpp/lib/QtWidgets/QTreeWidget/qtreewidget_wrap.cpp b/src/cpp/lib/QtWidgets/QTreeWidget/qtreewidget_wrap.cpp
index c054966ac..9eabb9e28 100644
--- a/src/cpp/lib/QtWidgets/QTreeWidget/qtreewidget_wrap.cpp
+++ b/src/cpp/lib/QtWidgets/QTreeWidget/qtreewidget_wrap.cpp
@@ -26,6 +26,8 @@ Napi::Object QTreeWidgetWrap::init(Napi::Env env, Napi::Object exports) {
        InstanceMethod("setItemWidget", &QTreeWidgetWrap::setItemWidget),
        InstanceMethod("currentItem", &QTreeWidgetWrap::currentItem),
        InstanceMethod("findItems", &QTreeWidgetWrap::findItems),
+       InstanceMethod("takeTopLevelItem", &QTreeWidgetWrap::takeTopLevelItem),
+       InstanceMethod("clear", &QTreeWidgetWrap::clear),
        QWIDGET_WRAPPED_METHODS_EXPORT_DEFINE(QTreeWidgetWrap)});
   constructor = Napi::Persistent(func);
   exports.Set(CLASSNAME, func);
@@ -213,12 +215,15 @@ Napi::Value QTreeWidgetWrap::currentItem(const Napi::CallbackInfo& info) {
   Napi::HandleScope scope(env);
 
   QTreeWidgetItem* currentItem = this->instance->currentItem();
+  if (currentItem != nullptr) {
+    Napi::Object value = QTreeWidgetItemWrap::constructor.New(
+        {Napi::External<QTreeWidgetItem>::New(
+            env, new QTreeWidgetItem(*currentItem))});
 
-  Napi::Object value = QTreeWidgetItemWrap::constructor.New(
-      {Napi::External<QTreeWidgetItem>::New(
-          env, new QTreeWidgetItem(*currentItem))});
-
-  return value;
+    return value;
+  } else {
+    return env.Null();
+  }
 }
 
 Napi::Value QTreeWidgetWrap::findItems(const Napi::CallbackInfo& info) {
@@ -242,3 +247,29 @@ Napi::Value QTreeWidgetWrap::findItems(const Napi::CallbackInfo& info) {
   }
   return napiItems;
 }
+
+Napi::Value QTreeWidgetWrap::takeTopLevelItem(const Napi::CallbackInfo& info) {
+  Napi::Env env = info.Env();
+  Napi::HandleScope scope(env);
+
+  int index = info[0].As<Napi::Number>().Int32Value();
+
+  QTreeWidgetItem* itemRemoved = this->instance->takeTopLevelItem(index);
+
+  if (itemRemoved != nullptr) {
+    Napi::Object value = QTreeWidgetItemWrap::constructor.New(
+        {Napi::External<QTreeWidgetItem>::New(
+            env, new QTreeWidgetItem(*itemRemoved))});
+
+    return value;
+  } else {
+    return env.Null();
+  }
+}
+
+Napi::Value QTreeWidgetWrap::clear(const Napi::CallbackInfo& info) {
+  Napi::Env env = info.Env();
+  Napi::HandleScope scope(env);
+  this->instance->clear();
+  return env.Null();
+}
diff --git a/src/demo.ts b/src/demo.ts
index 6f64b80f1..82215ee8c 100644
--- a/src/demo.ts
+++ b/src/demo.ts
@@ -1,16 +1,33 @@
 import { QMainWindow, QLabel, WidgetEventTypes, QMouseEvent } from './index';
+import { QPoint } from './lib/QtCore/QPoint';
+import { ContextMenuPolicy } from './lib/QtEnums';
+import { QMenu } from './lib/QtWidgets/QMenu';
+import { QAction } from './lib/QtWidgets/QAction';
 
 const win = new QMainWindow();
 
 const label = new QLabel();
 label.setText('Move your mouse here');
 label.setMouseTracking(true);
+label.setContextMenuPolicy(ContextMenuPolicy.CustomContextMenu);
 
 label.addEventListener(WidgetEventTypes.MouseMove, (nativeEvt) => {
     const mouseEvt = new QMouseEvent(nativeEvt as any);
     console.log('mouseMoved at: ', { x: mouseEvt.x(), y: mouseEvt.y() });
 });
 
+label.addEventListener('customContextMenuRequested', (pos: { x: number; y: number }): void => {
+    console.log(pos);
+    const position = new QPoint(pos.x, pos.y);
+    const menu = new QMenu();
+    const action = new QAction();
+
+    action.setText(`Hello World`);
+    menu.addAction(action);
+    const ptGlobal = label.mapToGlobal(position);
+    menu.exec(ptGlobal);
+});
+
 win.setCentralWidget(label);
 win.show();
 (global as any).win = win;
diff --git a/src/index.ts b/src/index.ts
index dac07acff..cb7fe868a 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -22,7 +22,7 @@ export { QMouseEvent } from './lib/QtGui/QEvent/QMouseEvent';
 export { WidgetEventTypes } from './lib/core/EventWidget';
 // Abstract:
 export { NodeWidget, QWidget, QWidgetSignals } from './lib/QtWidgets/QWidget';
-export { NodeLayout, QLayoutSignals } from './lib/QtWidgets/QLayout';
+export { NodeLayout, QLayoutSignals, SizeConstraint } from './lib/QtWidgets/QLayout';
 export { QAbstractScrollArea } from './lib/QtWidgets/QAbstractScrollArea';
 export { QAbstractSlider, QAbstractSliderSignals } from './lib/QtWidgets/QAbstractSlider';
 export { QAbstractButton, QAbstractButtonSignals } from './lib/QtWidgets/QAbstractButton';
@@ -100,6 +100,7 @@ export { QShortcut, QShortcutSignals } from './lib/QtWidgets/QShortcut';
 export { QGroupBox, QGroupBoxSignals } from './lib/QtWidgets/QGroupBox';
 export { QStatusBar, QStatusBarSignals } from './lib/QtWidgets/QStatusBar';
 export { QStandardItemModel, QStandardItemModelSignals } from './lib/QtWidgets/QStandardItemModel';
+export { QStandardItem } from './lib/QtWidgets/QStandardItem';
 // Core
 export { QDate } from './lib/QtCore/QDate';
 export { QDateTime } from './lib/QtCore/QDateTime';
diff --git a/src/lib/QtGui/__tests__/QPixmap.test.ts b/src/lib/QtGui/__tests__/QPixmap.test.ts
index f8f5e06e7..a69ae9b2a 100644
--- a/src/lib/QtGui/__tests__/QPixmap.test.ts
+++ b/src/lib/QtGui/__tests__/QPixmap.test.ts
@@ -57,18 +57,18 @@ describe('QPixmap', () => {
     });
     it('save to a file', async () => {
         const outputFilePath = path.resolve(__dirname, 'assets', 'nodegui_save.png');
-        await new Promise(resolve => fs.unlink(outputFilePath, resolve));
+        await new Promise((resolve) => fs.unlink(outputFilePath, resolve));
         const pixmap = new QPixmap(testImagePath);
         pixmap.save(outputFilePath);
-        const exists = await new Promise(resolve => fs.exists(outputFilePath, resolve));
+        const exists = await new Promise((resolve) => fs.exists(outputFilePath, resolve));
         expect(exists).toBe(true);
     });
     it('save to a file of different format', async () => {
         const outputFilePath = path.resolve(__dirname, 'assets', 'nodegui_save.jpg');
-        await new Promise(resolve => fs.unlink(outputFilePath, resolve));
+        await new Promise((resolve) => fs.unlink(outputFilePath, resolve));
         const pixmap = new QPixmap(testImagePath);
         pixmap.save(outputFilePath, 'JPG');
-        const exists = await new Promise(resolve => fs.exists(outputFilePath, resolve));
+        const exists = await new Promise((resolve) => fs.exists(outputFilePath, resolve));
         expect(exists).toBe(true);
     });
 });
diff --git a/src/lib/QtWidgets/QBoxLayout.ts b/src/lib/QtWidgets/QBoxLayout.ts
index 04d07b7ea..cb550d516 100644
--- a/src/lib/QtWidgets/QBoxLayout.ts
+++ b/src/lib/QtWidgets/QBoxLayout.ts
@@ -70,6 +70,12 @@ export class QBoxLayout extends NodeLayout<QBoxLayoutSignals> {
         this.native.insertLayout(index, layout.native, stretch);
         this.childLayouts.add(layout);
     }
+    insertSpacing(index: number, size: number): void {
+        this.native.insertSpacing(index, size);
+    }
+    insertStretch(index: number, stretch = 0): void {
+        this.native.insertStretch(index, stretch);
+    }
     removeWidget(widget: NodeWidget<any>): void {
         this.native.removeWidget(widget.native);
         this.nodeChildren.delete(widget);
@@ -77,6 +83,12 @@ export class QBoxLayout extends NodeLayout<QBoxLayoutSignals> {
     setDirection(dir: Direction): void {
         this.native.setDirection(dir);
     }
+    setStretch(index: number, stretch: number): void {
+        this.native.setStretch(index, stretch);
+    }
+    count(): number {
+        return this.native.count();
+    }
 }
 
 export type QBoxLayoutSignals = QLayoutSignals;
diff --git a/src/lib/QtWidgets/QLayout.ts b/src/lib/QtWidgets/QLayout.ts
index d855a9e91..018accb2e 100644
--- a/src/lib/QtWidgets/QLayout.ts
+++ b/src/lib/QtWidgets/QLayout.ts
@@ -36,9 +36,30 @@ export abstract class NodeLayout<Signals extends QLayoutSignals> extends NodeObj
     type = 'layout';
     abstract addWidget(childWidget: NodeWidget<any>, ...args: any[]): void;
     abstract removeWidget(childWidget: NodeWidget<any>): void;
+    setSizeConstraint(constraint: SizeConstraint): void {
+        this.setProperty('sizeConstraint', constraint);
+    }
+    sizeConstraint(): SizeConstraint {
+        return this.property('sizeConstraint').toInt();
+    }
+    setSpacing(spacing: number): void {
+        this.setProperty('spacing', spacing);
+    }
+    spacing(): number {
+        return this.property('spacing').toInt();
+    }
     activate(): boolean {
         return this.native.activate();
     }
+    setEnabled(enable: boolean): void {
+        this.native.setEnabled(enable);
+    }
+    isEnabled(): boolean {
+        return this.native.isEnabled();
+    }
+    setContentsMargins(left: number, top: number, right: number, bottom: number): void {
+        this.native.setContentsMargins(left, top, right, bottom);
+    }
     invalidate(): void {
         this.native.invalidate();
     }
@@ -51,4 +72,13 @@ export abstract class NodeLayout<Signals extends QLayoutSignals> extends NodeObj
 //   native: any;
 // }
 
+export enum SizeConstraint {
+    SetDefaultConstraint = 0,
+    SetNoConstraint = 1,
+    SetMinimumSize = 2,
+    SetFixedSize = 3,
+    SetMaximumSize = 4,
+    SetMinAndMaxSize = 5,
+}
+
 export type QLayoutSignals = QObjectSignals;
diff --git a/src/lib/QtWidgets/QListWidget.ts b/src/lib/QtWidgets/QListWidget.ts
index 19fa2cde0..616f409bf 100644
--- a/src/lib/QtWidgets/QListWidget.ts
+++ b/src/lib/QtWidgets/QListWidget.ts
@@ -81,7 +81,7 @@ export class QListWidget extends NodeListView<QListWidgetSignals> {
     }
     findItems(text: string, flags: MatchFlag): QListWidgetItem[] {
         const nativeItems = this.native.findItems(text, flags);
-        return nativeItems.map(function(item: QListWidgetItem) {
+        return nativeItems.map(function (item: QListWidgetItem) {
             return new QListWidgetItem(item);
         });
     }
@@ -115,7 +115,7 @@ export class QListWidget extends NodeListView<QListWidgetSignals> {
     }
     selectedItems(): QListWidgetItem[] {
         const nativeItems = this.native.selectedItems();
-        return nativeItems.map(function(item: QListWidgetItem) {
+        return nativeItems.map(function (item: QListWidgetItem) {
             return new QListWidgetItem(item);
         });
     }
diff --git a/src/lib/QtWidgets/QMenu.ts b/src/lib/QtWidgets/QMenu.ts
index 598ba26b8..2152e1964 100644
--- a/src/lib/QtWidgets/QMenu.ts
+++ b/src/lib/QtWidgets/QMenu.ts
@@ -36,16 +36,17 @@ export class QMenu extends NodeWidget<QMenuSignals> {
     setTitle(title: string): void {
         this.native.setTitle(title);
     }
-
     addSeparator(): QAction {
         return this.native.addSeparator();
     }
-    exec(point?: QPoint, action?: QAction): void {
+    exec(point?: QPoint, action?: QAction | null): void {
         if (point && action) {
             this.native.exec(point.native, action.native);
-            return;
+        } else if (point) {
+            this.native.exec(point.native);
+        } else {
+            this.native.exec();
         }
-        this.native.exec();
     }
     popup(point: QPoint, action?: QAction): void {
         this.native.popup(point.native, action?.native);
diff --git a/src/lib/QtWidgets/QPainter.ts b/src/lib/QtWidgets/QPainter.ts
index a8c617ec8..447bfbad8 100644
--- a/src/lib/QtWidgets/QPainter.ts
+++ b/src/lib/QtWidgets/QPainter.ts
@@ -94,7 +94,7 @@ export class QPainter extends Component {
     }
 
     drawConvexPolygon(points: QPoint[]): void {
-        const nativePoints = points.map(point => point.native);
+        const nativePoints = points.map((point) => point.native);
         this.native.drawConvexPolygon(nativePoints);
     }
 
diff --git a/src/lib/QtWidgets/QTreeWidget.ts b/src/lib/QtWidgets/QTreeWidget.ts
index a498cbfd7..4b63203d7 100644
--- a/src/lib/QtWidgets/QTreeWidget.ts
+++ b/src/lib/QtWidgets/QTreeWidget.ts
@@ -75,7 +75,7 @@ export class QTreeWidget extends QAbstractScrollArea<QTreeWidgetSignals> {
 
     addTopLevelItems(items: QTreeWidgetItem[]): void {
         const napiItems: NativeElement[] = [];
-        items.forEach(item => {
+        items.forEach((item) => {
             this.topLevelItems.add(item);
             napiItems.push(item.native);
         });
@@ -89,7 +89,7 @@ export class QTreeWidget extends QAbstractScrollArea<QTreeWidgetSignals> {
 
     insertTopLevelItems(index: number, items: QTreeWidgetItem[]): void {
         const napiItems: NativeElement[] = [];
-        items.forEach(item => {
+        items.forEach((item) => {
             this.topLevelItems.add(item);
             napiItems.push(item.native);
         });
@@ -102,7 +102,7 @@ export class QTreeWidget extends QAbstractScrollArea<QTreeWidgetSignals> {
 
     selectedItems(): QTreeWidgetItem[] {
         const nativeItems = this.native.selectedItems();
-        return nativeItems.map(function(eachItem: QTreeWidgetItem) {
+        return nativeItems.map(function (eachItem: QTreeWidgetItem) {
             return new QTreeWidgetItem(eachItem);
         });
     }
@@ -145,8 +145,13 @@ export class QTreeWidget extends QAbstractScrollArea<QTreeWidgetSignals> {
     /**
      * Returns the current item in the tree widget.
      */
-    currentItem(): QTreeWidgetItem {
-        return new QTreeWidgetItem(this.native.currentItem());
+    currentItem(): QTreeWidgetItem | void {
+        const item = this.native.currentItem();
+        if (item) {
+            return new QTreeWidgetItem(item);
+        } else {
+            return undefined;
+        }
     }
 
     /**
@@ -159,10 +164,24 @@ export class QTreeWidget extends QAbstractScrollArea<QTreeWidgetSignals> {
 
     findItems(text: string, flags: MatchFlag, column: number): QTreeWidgetItem[] {
         const nativeItems = this.native.findItems(text, flags, column);
-        return nativeItems.map(function(eachItem: QTreeWidgetItem) {
+        return nativeItems.map(function (eachItem: QTreeWidgetItem) {
             return new QTreeWidgetItem(eachItem);
         });
     }
+
+    takeTopLevelItem(index: number): QTreeWidgetItem | void {
+        const item = this.native.takeTopLevelItem(index);
+        if (item) {
+            return new QTreeWidgetItem(item);
+        } else {
+            return undefined;
+        }
+    }
+
+    clear(): void {
+        this.topLevelItems.clear();
+        this.native.clear();
+    }
 }
 
 export interface QTreeWidgetSignals extends QAbstractScrollAreaSignals {
diff --git a/src/lib/QtWidgets/QWidget.ts b/src/lib/QtWidgets/QWidget.ts
index 730654151..6cb06c9ef 100644
--- a/src/lib/QtWidgets/QWidget.ts
+++ b/src/lib/QtWidgets/QWidget.ts
@@ -9,6 +9,7 @@ import { CursorShape, WindowState } from '../QtEnums';
 import { StyleSheet, prepareInlineStyleSheet } from '../core/Style/StyleSheet';
 import { checkIfNativeElement } from '../utils/helpers';
 import { YogaWidget } from '../core/YogaWidget';
+import { QPoint } from '../QtCore/QPoint';
 import { QSize } from '../QtCore/QSize';
 import { QRect } from '../QtCore/QRect';
 import { QObjectSignals } from '../QtCore/QObject';
@@ -73,6 +74,18 @@ export abstract class NodeWidget<Signals extends QWidgetSignals> extends YogaWid
     close(): boolean {
         return this.native.close();
     }
+    mapFromGlobal(pos: QPoint): QPoint {
+        return new QPoint(this.native.mapFromGlobal(pos.native));
+    }
+    mapFromParent(pos: QPoint): QPoint {
+        return new QPoint(this.native.mapFromParent(pos.native));
+    }
+    mapToGlobal(pos: QPoint): QPoint {
+        return new QPoint(this.native.mapToGlobal(pos.native));
+    }
+    mapToParent(pos: QPoint): QPoint {
+        return new QPoint(this.native.mapToParent(pos.native));
+    }
     setStyleSheet(styleSheet: string): void {
         const preparedSheet = StyleSheet.create(styleSheet);
         this.native.setStyleSheet(preparedSheet);