diff --git a/package-lock.json b/package-lock.json index d33879d..b22acd2 100644 --- a/package-lock.json +++ b/package-lock.json @@ -20,20 +20,20 @@ "dev": true }, "@babel/core": { - "version": "7.15.0", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.15.0.tgz", - "integrity": "sha512-tXtmTminrze5HEUPn/a0JtOzzfp0nk+UEXQ/tqIJo3WDGypl/2OFQEMll/zSFU8f/lfmfLXvTaORHF3cfXIQMw==", + "version": "7.15.5", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.15.5.tgz", + "integrity": "sha512-pYgXxiwAgQpgM1bNkZsDEq85f0ggXMA5L7c+o3tskGMh2BunCI9QUwB9Z4jpvXUOuMdyGKiGKQiRe11VS6Jzvg==", "dev": true, "requires": { "@babel/code-frame": "^7.14.5", - "@babel/generator": "^7.15.0", - "@babel/helper-compilation-targets": "^7.15.0", - "@babel/helper-module-transforms": "^7.15.0", - "@babel/helpers": "^7.14.8", - "@babel/parser": "^7.15.0", - "@babel/template": "^7.14.5", - "@babel/traverse": "^7.15.0", - "@babel/types": "^7.15.0", + "@babel/generator": "^7.15.4", + "@babel/helper-compilation-targets": "^7.15.4", + "@babel/helper-module-transforms": "^7.15.4", + "@babel/helpers": "^7.15.4", + "@babel/parser": "^7.15.5", + "@babel/template": "^7.15.4", + "@babel/traverse": "^7.15.4", + "@babel/types": "^7.15.4", "convert-source-map": "^1.7.0", "debug": "^4.1.0", "gensync": "^1.0.0-beta.2", @@ -72,12 +72,12 @@ } }, "@babel/generator": { - "version": "7.15.0", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.15.0.tgz", - "integrity": "sha512-eKl4XdMrbpYvuB505KTta4AV9g+wWzmVBW69tX0H2NwKVKd2YJbKgyK6M8j/rgLbmHOYJn6rUklV677nOyJrEQ==", + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.15.4.tgz", + "integrity": "sha512-d3itta0tu+UayjEORPNz6e1T3FtvWlP5N4V5M+lhp/CxT4oAA7/NcScnpRyspUMLK6tu9MNHmQHxRykuN2R7hw==", "dev": true, "requires": { - "@babel/types": "^7.15.0", + "@babel/types": "^7.15.4", "jsesc": "^2.5.1", "source-map": "^0.5.0" }, @@ -91,28 +91,28 @@ } }, "@babel/helper-annotate-as-pure": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.14.5.tgz", - "integrity": "sha512-EivH9EgBIb+G8ij1B2jAwSH36WnGvkQSEC6CkX/6v6ZFlw5fVOHvsgGF4uiEHO2GzMvunZb6tDLQEQSdrdocrA==", + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.15.4.tgz", + "integrity": "sha512-QwrtdNvUNsPCj2lfNQacsGSQvGX8ee1ttrBrcozUP2Sv/jylewBP/8QFe6ZkBsC8T/GYWonNAWJV4aRR9AL2DA==", "dev": true, "requires": { - "@babel/types": "^7.14.5" + "@babel/types": "^7.15.4" } }, "@babel/helper-builder-binary-assignment-operator-visitor": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.14.5.tgz", - "integrity": "sha512-YTA/Twn0vBXDVGJuAX6PwW7x5zQei1luDDo2Pl6q1qZ7hVNl0RZrhHCQG/ArGpR29Vl7ETiB8eJyrvpuRp300w==", + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.15.4.tgz", + "integrity": "sha512-P8o7JP2Mzi0SdC6eWr1zF+AEYvrsZa7GSY1lTayjF5XJhVH0kjLYUZPvTMflP7tBgZoe9gIhTa60QwFpqh/E0Q==", "dev": true, "requires": { - "@babel/helper-explode-assignable-expression": "^7.14.5", - "@babel/types": "^7.14.5" + "@babel/helper-explode-assignable-expression": "^7.15.4", + "@babel/types": "^7.15.4" } }, "@babel/helper-compilation-targets": { - "version": "7.15.0", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.0.tgz", - "integrity": "sha512-h+/9t0ncd4jfZ8wsdAsoIxSa61qhBYlycXiHWqJaQBCXAhDCMbPRSMTGnZIkkmt1u4ag+UQmuqcILwqKzZ4N2A==", + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.15.4.tgz", + "integrity": "sha512-rMWPCirulnPSe4d+gwdWXLfAXTTBj8M3guAf5xFQJ0nvFY7tfNAFnWdqaHegHlgDZOCT4qvhF3BYlSJag8yhqQ==", "dev": true, "requires": { "@babel/compat-data": "^7.15.0", @@ -130,17 +130,17 @@ } }, "@babel/helper-create-class-features-plugin": { - "version": "7.15.0", - "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.15.0.tgz", - "integrity": "sha512-MdmDXgvTIi4heDVX/e9EFfeGpugqm9fobBVg/iioE8kueXrOHdRDe36FAY7SnE9xXLVeYCoJR/gdrBEIHRC83Q==", + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.15.4.tgz", + "integrity": "sha512-7ZmzFi+DwJx6A7mHRwbuucEYpyBwmh2Ca0RvI6z2+WLZYCqV0JOaLb+u0zbtmDicebgKBZgqbYfLaKNqSgv5Pw==", "dev": true, "requires": { - "@babel/helper-annotate-as-pure": "^7.14.5", - "@babel/helper-function-name": "^7.14.5", - "@babel/helper-member-expression-to-functions": "^7.15.0", - "@babel/helper-optimise-call-expression": "^7.14.5", - "@babel/helper-replace-supers": "^7.15.0", - "@babel/helper-split-export-declaration": "^7.14.5" + "@babel/helper-annotate-as-pure": "^7.15.4", + "@babel/helper-function-name": "^7.15.4", + "@babel/helper-member-expression-to-functions": "^7.15.4", + "@babel/helper-optimise-call-expression": "^7.15.4", + "@babel/helper-replace-supers": "^7.15.4", + "@babel/helper-split-export-declaration": "^7.15.4" } }, "@babel/helper-create-regexp-features-plugin": { @@ -193,84 +193,84 @@ } }, "@babel/helper-explode-assignable-expression": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.14.5.tgz", - "integrity": "sha512-Htb24gnGJdIGT4vnRKMdoXiOIlqOLmdiUYpAQ0mYfgVT/GDm8GOYhgi4GL+hMKrkiPRohO4ts34ELFsGAPQLDQ==", + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.15.4.tgz", + "integrity": "sha512-J14f/vq8+hdC2KoWLIQSsGrC9EFBKE4NFts8pfMpymfApds+fPqR30AOUWc4tyr56h9l/GA1Sxv2q3dLZWbQ/g==", "dev": true, "requires": { - "@babel/types": "^7.14.5" + "@babel/types": "^7.15.4" } }, "@babel/helper-function-name": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz", - "integrity": "sha512-Gjna0AsXWfFvrAuX+VKcN/aNNWonizBj39yGwUzVDVTlMYJMK2Wp6xdpy72mfArFq5uK+NOuexfzZlzI1z9+AQ==", + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.15.4.tgz", + "integrity": "sha512-Z91cOMM4DseLIGOnog+Z8OI6YseR9bua+HpvLAQ2XayUGU+neTtX+97caALaLdyu53I/fjhbeCnWnRH1O3jFOw==", "dev": true, "requires": { - "@babel/helper-get-function-arity": "^7.14.5", - "@babel/template": "^7.14.5", - "@babel/types": "^7.14.5" + "@babel/helper-get-function-arity": "^7.15.4", + "@babel/template": "^7.15.4", + "@babel/types": "^7.15.4" } }, "@babel/helper-get-function-arity": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz", - "integrity": "sha512-I1Db4Shst5lewOM4V+ZKJzQ0JGGaZ6VY1jYvMghRjqs6DWgxLCIyFt30GlnKkfUeFLpJt2vzbMVEXVSXlIFYUg==", + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.15.4.tgz", + "integrity": "sha512-1/AlxSF92CmGZzHnC515hm4SirTxtpDnLEJ0UyEMgTMZN+6bxXKg04dKhiRx5Enel+SUA1G1t5Ed/yQia0efrA==", "dev": true, "requires": { - "@babel/types": "^7.14.5" + "@babel/types": "^7.15.4" } }, "@babel/helper-hoist-variables": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.14.5.tgz", - "integrity": "sha512-R1PXiz31Uc0Vxy4OEOm07x0oSjKAdPPCh3tPivn/Eo8cvz6gveAeuyUUPB21Hoiif0uoPQSSdhIPS3352nvdyQ==", + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.15.4.tgz", + "integrity": "sha512-VTy085egb3jUGVK9ycIxQiPbquesq0HUQ+tPO0uv5mPEBZipk+5FkRKiWq5apuyTE9FUrjENB0rCf8y+n+UuhA==", "dev": true, "requires": { - "@babel/types": "^7.14.5" + "@babel/types": "^7.15.4" } }, "@babel/helper-member-expression-to-functions": { - "version": "7.15.0", - "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.0.tgz", - "integrity": "sha512-Jq8H8U2kYiafuj2xMTPQwkTBnEEdGKpT35lJEQsRRjnG0LW3neucsaMWLgKcwu3OHKNeYugfw+Z20BXBSEs2Lg==", + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.15.4.tgz", + "integrity": "sha512-cokOMkxC/BTyNP1AlY25HuBWM32iCEsLPI4BHDpJCHHm1FU2E7dKWWIXJgQgSFiu4lp8q3bL1BIKwqkSUviqtA==", "dev": true, "requires": { - "@babel/types": "^7.15.0" + "@babel/types": "^7.15.4" } }, "@babel/helper-module-imports": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.14.5.tgz", - "integrity": "sha512-SwrNHu5QWS84XlHwGYPDtCxcA0hrSlL2yhWYLgeOc0w7ccOl2qv4s/nARI0aYZW+bSwAL5CukeXA47B/1NKcnQ==", + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.15.4.tgz", + "integrity": "sha512-jeAHZbzUwdW/xHgHQ3QmWR4Jg6j15q4w/gCfwZvtqOxoo5DKtLHk8Bsf4c5RZRC7NmLEs+ohkdq8jFefuvIxAA==", "dev": true, "requires": { - "@babel/types": "^7.14.5" + "@babel/types": "^7.15.4" } }, "@babel/helper-module-transforms": { - "version": "7.15.0", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.15.0.tgz", - "integrity": "sha512-RkGiW5Rer7fpXv9m1B3iHIFDZdItnO2/BLfWVW/9q7+KqQSDY5kUfQEbzdXM1MVhJGcugKV7kRrNVzNxmk7NBg==", + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.15.4.tgz", + "integrity": "sha512-9fHHSGE9zTC++KuXLZcB5FKgvlV83Ox+NLUmQTawovwlJ85+QMhk1CnVk406CQVj97LaWod6KVjl2Sfgw9Aktw==", "dev": true, "requires": { - "@babel/helper-module-imports": "^7.14.5", - "@babel/helper-replace-supers": "^7.15.0", - "@babel/helper-simple-access": "^7.14.8", - "@babel/helper-split-export-declaration": "^7.14.5", + "@babel/helper-module-imports": "^7.15.4", + "@babel/helper-replace-supers": "^7.15.4", + "@babel/helper-simple-access": "^7.15.4", + "@babel/helper-split-export-declaration": "^7.15.4", "@babel/helper-validator-identifier": "^7.14.9", - "@babel/template": "^7.14.5", - "@babel/traverse": "^7.15.0", - "@babel/types": "^7.15.0" + "@babel/template": "^7.15.4", + "@babel/traverse": "^7.15.4", + "@babel/types": "^7.15.4" } }, "@babel/helper-optimise-call-expression": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.14.5.tgz", - "integrity": "sha512-IqiLIrODUOdnPU9/F8ib1Fx2ohlgDhxnIDU7OEVi+kAbEZcyiF7BLU8W6PfvPi9LzztjS7kcbzbmL7oG8kD6VA==", + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.15.4.tgz", + "integrity": "sha512-E/z9rfbAOt1vDW1DR7k4SzhzotVV5+qMciWV6LaG1g4jeFrkDlJedjtV4h0i4Q/ITnUu+Pk08M7fczsB9GXBDw==", "dev": true, "requires": { - "@babel/types": "^7.14.5" + "@babel/types": "^7.15.4" } }, "@babel/helper-plugin-utils": { @@ -280,53 +280,53 @@ "dev": true }, "@babel/helper-remap-async-to-generator": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.14.5.tgz", - "integrity": "sha512-rLQKdQU+HYlxBwQIj8dk4/0ENOUEhA/Z0l4hN8BexpvmSMN9oA9EagjnhnDpNsRdWCfjwa4mn/HyBXO9yhQP6A==", + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.15.4.tgz", + "integrity": "sha512-v53MxgvMK/HCwckJ1bZrq6dNKlmwlyRNYM6ypaRTdXWGOE2c1/SCa6dL/HimhPulGhZKw9W0QhREM583F/t0vQ==", "dev": true, "requires": { - "@babel/helper-annotate-as-pure": "^7.14.5", - "@babel/helper-wrap-function": "^7.14.5", - "@babel/types": "^7.14.5" + "@babel/helper-annotate-as-pure": "^7.15.4", + "@babel/helper-wrap-function": "^7.15.4", + "@babel/types": "^7.15.4" } }, "@babel/helper-replace-supers": { - "version": "7.15.0", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.15.0.tgz", - "integrity": "sha512-6O+eWrhx+HEra/uJnifCwhwMd6Bp5+ZfZeJwbqUTuqkhIT6YcRhiZCOOFChRypOIe0cV46kFrRBlm+t5vHCEaA==", + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.15.4.tgz", + "integrity": "sha512-/ztT6khaXF37MS47fufrKvIsiQkx1LBRvSJNzRqmbyeZnTwU9qBxXYLaaT/6KaxfKhjs2Wy8kG8ZdsFUuWBjzw==", "dev": true, "requires": { - "@babel/helper-member-expression-to-functions": "^7.15.0", - "@babel/helper-optimise-call-expression": "^7.14.5", - "@babel/traverse": "^7.15.0", - "@babel/types": "^7.15.0" + "@babel/helper-member-expression-to-functions": "^7.15.4", + "@babel/helper-optimise-call-expression": "^7.15.4", + "@babel/traverse": "^7.15.4", + "@babel/types": "^7.15.4" } }, "@babel/helper-simple-access": { - "version": "7.14.8", - "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.14.8.tgz", - "integrity": "sha512-TrFN4RHh9gnWEU+s7JloIho2T76GPwRHhdzOWLqTrMnlas8T9O7ec+oEDNsRXndOmru9ymH9DFrEOxpzPoSbdg==", + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.15.4.tgz", + "integrity": "sha512-UzazrDoIVOZZcTeHHEPYrr1MvTR/K+wgLg6MY6e1CJyaRhbibftF6fR2KU2sFRtI/nERUZR9fBd6aKgBlIBaPg==", "dev": true, "requires": { - "@babel/types": "^7.14.8" + "@babel/types": "^7.15.4" } }, "@babel/helper-skip-transparent-expression-wrappers": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.14.5.tgz", - "integrity": "sha512-dmqZB7mrb94PZSAOYtr+ZN5qt5owZIAgqtoTuqiFbHFtxgEcmQlRJVI+bO++fciBunXtB6MK7HrzrfcAzIz2NQ==", + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.15.4.tgz", + "integrity": "sha512-BMRLsdh+D1/aap19TycS4eD1qELGrCBJwzaY9IE8LrpJtJb+H7rQkPIdsfgnMtLBA6DJls7X9z93Z4U8h7xw0A==", "dev": true, "requires": { - "@babel/types": "^7.14.5" + "@babel/types": "^7.15.4" } }, "@babel/helper-split-export-declaration": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz", - "integrity": "sha512-hprxVPu6e5Kdp2puZUmvOGjaLv9TCe58E/Fl6hRq4YiVQxIcNvuq6uTM2r1mT/oPskuS9CgR+I94sqAYv0NGKA==", + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.15.4.tgz", + "integrity": "sha512-HsFqhLDZ08DxCpBdEVtKmywj6PQbwnF6HHybur0MAnkAKnlS6uHkwnmRIkElB2Owpfb4xL4NwDmDLFubueDXsw==", "dev": true, "requires": { - "@babel/types": "^7.14.5" + "@babel/types": "^7.15.4" } }, "@babel/helper-validator-identifier": { @@ -342,26 +342,26 @@ "dev": true }, "@babel/helper-wrap-function": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.14.5.tgz", - "integrity": "sha512-YEdjTCq+LNuNS1WfxsDCNpgXkJaIyqco6DAelTUjT4f2KIWC1nBcaCaSdHTBqQVLnTBexBcVcFhLSU1KnYuePQ==", + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.15.4.tgz", + "integrity": "sha512-Y2o+H/hRV5W8QhIfTpRIBwl57y8PrZt6JM3V8FOo5qarjshHItyH5lXlpMfBfmBefOqSCpKZs/6Dxqp0E/U+uw==", "dev": true, "requires": { - "@babel/helper-function-name": "^7.14.5", - "@babel/template": "^7.14.5", - "@babel/traverse": "^7.14.5", - "@babel/types": "^7.14.5" + "@babel/helper-function-name": "^7.15.4", + "@babel/template": "^7.15.4", + "@babel/traverse": "^7.15.4", + "@babel/types": "^7.15.4" } }, "@babel/helpers": { - "version": "7.15.3", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.15.3.tgz", - "integrity": "sha512-HwJiz52XaS96lX+28Tnbu31VeFSQJGOeKHJeaEPQlTl7PnlhFElWPj8tUXtqFIzeN86XxXoBr+WFAyK2PPVz6g==", + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.15.4.tgz", + "integrity": "sha512-V45u6dqEJ3w2rlryYYXf6i9rQ5YMNu4FLS6ngs8ikblhu2VdR1AqAd6aJjBzmf2Qzh6KOLqKHxEN9+TFbAkAVQ==", "dev": true, "requires": { - "@babel/template": "^7.14.5", - "@babel/traverse": "^7.15.0", - "@babel/types": "^7.15.0" + "@babel/template": "^7.15.4", + "@babel/traverse": "^7.15.4", + "@babel/types": "^7.15.4" } }, "@babel/highlight": { @@ -434,30 +434,30 @@ } }, "@babel/parser": { - "version": "7.15.3", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.3.tgz", - "integrity": "sha512-O0L6v/HvqbdJawj0iBEfVQMc3/6WP+AeOsovsIgBFyJaG+W2w7eqvZB7puddATmWuARlm1SX7DwxJ/JJUnDpEA==", + "version": "7.15.6", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.15.6.tgz", + "integrity": "sha512-S/TSCcsRuCkmpUuoWijua0Snt+f3ewU/8spLo+4AXJCZfT0bVCzLD5MuOKdrx0mlAptbKzn5AdgEIIKXxXkz9Q==", "dev": true }, "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5.tgz", - "integrity": "sha512-ZoJS2XCKPBfTmL122iP6NM9dOg+d4lc9fFk3zxc8iDjvt8Pk4+TlsHSKhIPf6X+L5ORCdBzqMZDjL/WHj7WknQ==", + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.15.4.tgz", + "integrity": "sha512-eBnpsl9tlhPhpI10kU06JHnrYXwg3+V6CaP2idsCXNef0aeslpqyITXQ74Vfk5uHgY7IG7XP0yIH8b42KSzHog==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.14.5", - "@babel/helper-skip-transparent-expression-wrappers": "^7.14.5", + "@babel/helper-skip-transparent-expression-wrappers": "^7.15.4", "@babel/plugin-proposal-optional-chaining": "^7.14.5" } }, "@babel/plugin-proposal-async-generator-functions": { - "version": "7.14.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.9.tgz", - "integrity": "sha512-d1lnh+ZnKrFKwtTYdw320+sQWCTwgkB9fmUhNXRADA4akR6wLjaruSGnIEUjpt9HCOwTr4ynFTKu19b7rFRpmw==", + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.15.4.tgz", + "integrity": "sha512-2zt2g5vTXpMC3OmK6uyjvdXptbhBXfA77XGrd3gh93zwG8lZYBLOBImiGBEG0RANu3JqKEACCz5CGk73OJROBw==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.14.5", - "@babel/helper-remap-async-to-generator": "^7.14.5", + "@babel/helper-remap-async-to-generator": "^7.15.4", "@babel/plugin-syntax-async-generators": "^7.8.4" } }, @@ -472,12 +472,12 @@ } }, "@babel/plugin-proposal-class-static-block": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.14.5.tgz", - "integrity": "sha512-KBAH5ksEnYHCegqseI5N9skTdxgJdmDoAOc0uXa+4QMYKeZD0w5IARh4FMlTNtaHhbB8v+KzMdTgxMMzsIy6Yg==", + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.15.4.tgz", + "integrity": "sha512-M682XWrrLNk3chXCjoPUQWOyYsB93B9z3mRyjtqqYJWDf2mfCdIYgDrA11cgNVhAQieaq6F2fn2f3wI0U4aTjA==", "dev": true, "requires": { - "@babel/helper-create-class-features-plugin": "^7.14.5", + "@babel/helper-create-class-features-plugin": "^7.15.4", "@babel/helper-plugin-utils": "^7.14.5", "@babel/plugin-syntax-class-static-block": "^7.14.5" } @@ -543,16 +543,16 @@ } }, "@babel/plugin-proposal-object-rest-spread": { - "version": "7.14.7", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.14.7.tgz", - "integrity": "sha512-082hsZz+sVabfmDWo1Oct1u1AgbKbUAyVgmX4otIc7bdsRgHBXwTwb3DpDmD4Eyyx6DNiuz5UAATT655k+kL5g==", + "version": "7.15.6", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.15.6.tgz", + "integrity": "sha512-qtOHo7A1Vt+O23qEAX+GdBpqaIuD3i9VRrWgCJeq7WO6H2d14EK3q11urj5Te2MAeK97nMiIdRpwd/ST4JFbNg==", "dev": true, "requires": { - "@babel/compat-data": "^7.14.7", - "@babel/helper-compilation-targets": "^7.14.5", + "@babel/compat-data": "^7.15.0", + "@babel/helper-compilation-targets": "^7.15.4", "@babel/helper-plugin-utils": "^7.14.5", "@babel/plugin-syntax-object-rest-spread": "^7.8.3", - "@babel/plugin-transform-parameters": "^7.14.5" + "@babel/plugin-transform-parameters": "^7.15.4" } }, "@babel/plugin-proposal-optional-catch-binding": { @@ -587,13 +587,13 @@ } }, "@babel/plugin-proposal-private-property-in-object": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.14.5.tgz", - "integrity": "sha512-62EyfyA3WA0mZiF2e2IV9mc9Ghwxcg8YTu8BS4Wss4Y3PY725OmS9M0qLORbJwLqFtGh+jiE4wAmocK2CTUK2Q==", + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.15.4.tgz", + "integrity": "sha512-X0UTixkLf0PCCffxgu5/1RQyGGbgZuKoI+vXP4iSbJSYwPb7hu06omsFGBvQ9lJEvwgrxHdS8B5nbfcd8GyUNA==", "dev": true, "requires": { - "@babel/helper-annotate-as-pure": "^7.14.5", - "@babel/helper-create-class-features-plugin": "^7.14.5", + "@babel/helper-annotate-as-pure": "^7.15.4", + "@babel/helper-create-class-features-plugin": "^7.15.4", "@babel/helper-plugin-utils": "^7.14.5", "@babel/plugin-syntax-private-property-in-object": "^7.14.5" } @@ -752,6 +752,15 @@ "@babel/helper-plugin-utils": "^7.14.5" } }, + "@babel/plugin-syntax-typescript": { + "version": "7.14.5", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.14.5.tgz", + "integrity": "sha512-u6OXzDaIXjEstBRRoBCQ/uKQKlbuaeE5in0RvWdA4pN6AhqxTIwUsnHPU1CFZA/amYObMsuWhYfRl3Ch90HD0Q==", + "dev": true, + "requires": { + "@babel/helper-plugin-utils": "^7.14.5" + } + }, "@babel/plugin-transform-arrow-functions": { "version": "7.14.5", "resolved": "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.14.5.tgz", @@ -791,17 +800,17 @@ } }, "@babel/plugin-transform-classes": { - "version": "7.14.9", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.9.tgz", - "integrity": "sha512-NfZpTcxU3foGWbl4wxmZ35mTsYJy8oQocbeIMoDAGGFarAmSQlL+LWMkDx/tj6pNotpbX3rltIA4dprgAPOq5A==", + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.15.4.tgz", + "integrity": "sha512-Yjvhex8GzBmmPQUvpXRPWQ9WnxXgAFuZSrqOK/eJlOGIXwvv8H3UEdUigl1gb/bnjTrln+e8bkZUYCBt/xYlBg==", "dev": true, "requires": { - "@babel/helper-annotate-as-pure": "^7.14.5", - "@babel/helper-function-name": "^7.14.5", - "@babel/helper-optimise-call-expression": "^7.14.5", + "@babel/helper-annotate-as-pure": "^7.15.4", + "@babel/helper-function-name": "^7.15.4", + "@babel/helper-optimise-call-expression": "^7.15.4", "@babel/helper-plugin-utils": "^7.14.5", - "@babel/helper-replace-supers": "^7.14.5", - "@babel/helper-split-export-declaration": "^7.14.5", + "@babel/helper-replace-supers": "^7.15.4", + "@babel/helper-split-export-declaration": "^7.15.4", "globals": "^11.1.0" } }, @@ -853,9 +862,9 @@ } }, "@babel/plugin-transform-for-of": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.14.5.tgz", - "integrity": "sha512-CfmqxSUZzBl0rSjpoQSFoR9UEj3HzbGuGNL21/iFTmjb5gFggJp3ph0xR1YBhexmLoKRHzgxuFvty2xdSt6gTA==", + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.15.4.tgz", + "integrity": "sha512-DRTY9fA751AFBDh2oxydvVm4SYevs5ILTWLs6xKXps4Re/KG5nfUkr+TdHCrRWB8C69TlzVgA9b3RmGWmgN9LA==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.14.5" @@ -901,27 +910,27 @@ } }, "@babel/plugin-transform-modules-commonjs": { - "version": "7.15.0", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.15.0.tgz", - "integrity": "sha512-3H/R9s8cXcOGE8kgMlmjYYC9nqr5ELiPkJn4q0mypBrjhYQoc+5/Maq69vV4xRPWnkzZuwJPf5rArxpB/35Cig==", + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.15.4.tgz", + "integrity": "sha512-qg4DPhwG8hKp4BbVDvX1s8cohM8a6Bvptu4l6Iingq5rW+yRUAhe/YRup/YcW2zCOlrysEWVhftIcKzrEZv3sA==", "dev": true, "requires": { - "@babel/helper-module-transforms": "^7.15.0", + "@babel/helper-module-transforms": "^7.15.4", "@babel/helper-plugin-utils": "^7.14.5", - "@babel/helper-simple-access": "^7.14.8", + "@babel/helper-simple-access": "^7.15.4", "babel-plugin-dynamic-import-node": "^2.3.3" } }, "@babel/plugin-transform-modules-systemjs": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.14.5.tgz", - "integrity": "sha512-mNMQdvBEE5DcMQaL5LbzXFMANrQjd2W7FPzg34Y4yEz7dBgdaC+9B84dSO+/1Wba98zoDbInctCDo4JGxz1VYA==", + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.15.4.tgz", + "integrity": "sha512-fJUnlQrl/mezMneR72CKCgtOoahqGJNVKpompKwzv3BrEXdlPspTcyxrZ1XmDTIr9PpULrgEQo3qNKp6dW7ssw==", "dev": true, "requires": { - "@babel/helper-hoist-variables": "^7.14.5", - "@babel/helper-module-transforms": "^7.14.5", + "@babel/helper-hoist-variables": "^7.15.4", + "@babel/helper-module-transforms": "^7.15.4", "@babel/helper-plugin-utils": "^7.14.5", - "@babel/helper-validator-identifier": "^7.14.5", + "@babel/helper-validator-identifier": "^7.14.9", "babel-plugin-dynamic-import-node": "^2.3.3" } }, @@ -964,9 +973,9 @@ } }, "@babel/plugin-transform-parameters": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.14.5.tgz", - "integrity": "sha512-Tl7LWdr6HUxTmzQtzuU14SqbgrSKmaR77M0OKyq4njZLQTPfOvzblNKyNkGwOfEFCEx7KeYHQHDI0P3F02IVkA==", + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.15.4.tgz", + "integrity": "sha512-9WB/GUTO6lvJU3XQsSr6J/WKvBC2hcs4Pew8YxZagi6GkTdniyqp8On5kqdK8MN0LMeu0mGbhPN+O049NV/9FQ==", "dev": true, "requires": { "@babel/helper-plugin-utils": "^7.14.5" @@ -1065,30 +1074,30 @@ } }, "@babel/preset-env": { - "version": "7.15.0", - "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.15.0.tgz", - "integrity": "sha512-FhEpCNFCcWW3iZLg0L2NPE9UerdtsCR6ZcsGHUX6Om6kbCQeL5QZDqFDmeNHC6/fy6UH3jEge7K4qG5uC9In0Q==", + "version": "7.15.6", + "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.15.6.tgz", + "integrity": "sha512-L+6jcGn7EWu7zqaO2uoTDjjMBW+88FXzV8KvrBl2z6MtRNxlsmUNRlZPaNNPUTgqhyC5DHNFk/2Jmra+ublZWw==", "dev": true, "requires": { "@babel/compat-data": "^7.15.0", - "@babel/helper-compilation-targets": "^7.15.0", + "@babel/helper-compilation-targets": "^7.15.4", "@babel/helper-plugin-utils": "^7.14.5", "@babel/helper-validator-option": "^7.14.5", - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.14.5", - "@babel/plugin-proposal-async-generator-functions": "^7.14.9", + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "^7.15.4", + "@babel/plugin-proposal-async-generator-functions": "^7.15.4", "@babel/plugin-proposal-class-properties": "^7.14.5", - "@babel/plugin-proposal-class-static-block": "^7.14.5", + "@babel/plugin-proposal-class-static-block": "^7.15.4", "@babel/plugin-proposal-dynamic-import": "^7.14.5", "@babel/plugin-proposal-export-namespace-from": "^7.14.5", "@babel/plugin-proposal-json-strings": "^7.14.5", "@babel/plugin-proposal-logical-assignment-operators": "^7.14.5", "@babel/plugin-proposal-nullish-coalescing-operator": "^7.14.5", "@babel/plugin-proposal-numeric-separator": "^7.14.5", - "@babel/plugin-proposal-object-rest-spread": "^7.14.7", + "@babel/plugin-proposal-object-rest-spread": "^7.15.6", "@babel/plugin-proposal-optional-catch-binding": "^7.14.5", "@babel/plugin-proposal-optional-chaining": "^7.14.5", "@babel/plugin-proposal-private-methods": "^7.14.5", - "@babel/plugin-proposal-private-property-in-object": "^7.14.5", + "@babel/plugin-proposal-private-property-in-object": "^7.15.4", "@babel/plugin-proposal-unicode-property-regex": "^7.14.5", "@babel/plugin-syntax-async-generators": "^7.8.4", "@babel/plugin-syntax-class-properties": "^7.12.13", @@ -1107,25 +1116,25 @@ "@babel/plugin-transform-arrow-functions": "^7.14.5", "@babel/plugin-transform-async-to-generator": "^7.14.5", "@babel/plugin-transform-block-scoped-functions": "^7.14.5", - "@babel/plugin-transform-block-scoping": "^7.14.5", - "@babel/plugin-transform-classes": "^7.14.9", + "@babel/plugin-transform-block-scoping": "^7.15.3", + "@babel/plugin-transform-classes": "^7.15.4", "@babel/plugin-transform-computed-properties": "^7.14.5", "@babel/plugin-transform-destructuring": "^7.14.7", "@babel/plugin-transform-dotall-regex": "^7.14.5", "@babel/plugin-transform-duplicate-keys": "^7.14.5", "@babel/plugin-transform-exponentiation-operator": "^7.14.5", - "@babel/plugin-transform-for-of": "^7.14.5", + "@babel/plugin-transform-for-of": "^7.15.4", "@babel/plugin-transform-function-name": "^7.14.5", "@babel/plugin-transform-literals": "^7.14.5", "@babel/plugin-transform-member-expression-literals": "^7.14.5", "@babel/plugin-transform-modules-amd": "^7.14.5", - "@babel/plugin-transform-modules-commonjs": "^7.15.0", - "@babel/plugin-transform-modules-systemjs": "^7.14.5", + "@babel/plugin-transform-modules-commonjs": "^7.15.4", + "@babel/plugin-transform-modules-systemjs": "^7.15.4", "@babel/plugin-transform-modules-umd": "^7.14.5", "@babel/plugin-transform-named-capturing-groups-regex": "^7.14.9", "@babel/plugin-transform-new-target": "^7.14.5", "@babel/plugin-transform-object-super": "^7.14.5", - "@babel/plugin-transform-parameters": "^7.14.5", + "@babel/plugin-transform-parameters": "^7.15.4", "@babel/plugin-transform-property-literals": "^7.14.5", "@babel/plugin-transform-regenerator": "^7.14.5", "@babel/plugin-transform-reserved-words": "^7.14.5", @@ -1137,7 +1146,7 @@ "@babel/plugin-transform-unicode-escapes": "^7.14.5", "@babel/plugin-transform-unicode-regex": "^7.14.5", "@babel/preset-modules": "^0.1.4", - "@babel/types": "^7.15.0", + "@babel/types": "^7.15.6", "babel-plugin-polyfill-corejs2": "^0.2.2", "babel-plugin-polyfill-corejs3": "^0.2.2", "babel-plugin-polyfill-regenerator": "^0.2.2", @@ -1145,15 +1154,6 @@ "semver": "^6.3.0" }, "dependencies": { - "babel-plugin-polyfill-regenerator": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.2.tgz", - "integrity": "sha512-Goy5ghsc21HgPDFtzRkSirpZVW35meGoTmTOb2bxqdl60ghub4xOidgNTHaZfQ2FaxQsKmwvXtOAkcIS4SMBWg==", - "dev": true, - "requires": { - "@babel/helper-define-polyfill-provider": "^0.2.2" - } - }, "semver": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", @@ -1176,18 +1176,18 @@ } }, "@babel/runtime": { - "version": "7.15.3", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.3.tgz", - "integrity": "sha512-OvwMLqNXkCXSz1kSm58sEsNuhqOx/fKpnUnKnFB5v8uDda5bLNEHNgKPvhDN6IU0LDcnHQ90LlJ0Q6jnyBSIBA==", + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.15.4.tgz", + "integrity": "sha512-99catp6bHCaxr4sJ/DbTGgHS4+Rs2RVd2g7iOap6SLGPDknRK9ztKNsE/Fg6QhSeh1FGE5f6gHGQmvvn3I3xhw==", "dev": true, "requires": { "regenerator-runtime": "^0.13.4" } }, "@babel/runtime-corejs3": { - "version": "7.15.3", - "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.15.3.tgz", - "integrity": "sha512-30A3lP+sRL6ml8uhoJSs+8jwpKzbw8CqBvDc1laeptxPm5FahumJxirigcbD2qTs71Sonvj1cyZB0OKGAmxQ+A==", + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/runtime-corejs3/-/runtime-corejs3-7.15.4.tgz", + "integrity": "sha512-lWcAqKeB624/twtTc3w6w/2o9RqJPaNBhPGK6DKLSiwuVWC7WFkypWyNg+CpZoyJH0jVzv1uMtXZ/5/lQOLtCg==", "dev": true, "requires": { "core-js-pure": "^3.16.0", @@ -1195,29 +1195,29 @@ } }, "@babel/template": { - "version": "7.14.5", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.14.5.tgz", - "integrity": "sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g==", + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.15.4.tgz", + "integrity": "sha512-UgBAfEa1oGuYgDIPM2G+aHa4Nlo9Lh6mGD2bDBGMTbYnc38vulXPuC1MGjYILIEmlwl6Rd+BPR9ee3gm20CBtg==", "dev": true, "requires": { "@babel/code-frame": "^7.14.5", - "@babel/parser": "^7.14.5", - "@babel/types": "^7.14.5" + "@babel/parser": "^7.15.4", + "@babel/types": "^7.15.4" } }, "@babel/traverse": { - "version": "7.15.0", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.15.0.tgz", - "integrity": "sha512-392d8BN0C9eVxVWd8H6x9WfipgVH5IaIoLp23334Sc1vbKKWINnvwRpb4us0xtPaCumlwbTtIYNA0Dv/32sVFw==", + "version": "7.15.4", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.15.4.tgz", + "integrity": "sha512-W6lQD8l4rUbQR/vYgSuCAE75ADyyQvOpFVsvPPdkhf6lATXAsQIG9YdtOcu8BB1dZ0LKu+Zo3c1wEcbKeuhdlA==", "dev": true, "requires": { "@babel/code-frame": "^7.14.5", - "@babel/generator": "^7.15.0", - "@babel/helper-function-name": "^7.14.5", - "@babel/helper-hoist-variables": "^7.14.5", - "@babel/helper-split-export-declaration": "^7.14.5", - "@babel/parser": "^7.15.0", - "@babel/types": "^7.15.0", + "@babel/generator": "^7.15.4", + "@babel/helper-function-name": "^7.15.4", + "@babel/helper-hoist-variables": "^7.15.4", + "@babel/helper-split-export-declaration": "^7.15.4", + "@babel/parser": "^7.15.4", + "@babel/types": "^7.15.4", "debug": "^4.1.0", "globals": "^11.1.0" }, @@ -1240,9 +1240,9 @@ } }, "@babel/types": { - "version": "7.15.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.0.tgz", - "integrity": "sha512-OBvfqnllOIdX4ojTHpwZbpvz4j3EWyjkZEdmjH0/cgsd6QOdSgU8rLSk6ard/pcW7rlmjdVSX/AWOaORR1uNOQ==", + "version": "7.15.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.15.6.tgz", + "integrity": "sha512-BPU+7QhqNjmWyDO0/vitH/CuhpV8ZmK1wpKva8nuyNF5MJfuRNWMc+hc14+u9xT93kvykMdncrJT19h74uB1Ig==", "dev": true, "requires": { "@babel/helper-validator-identifier": "^7.14.9", @@ -1255,14 +1255,59 @@ "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==", "dev": true }, - "@cnakazawa/watch": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.4.tgz", - "integrity": "sha512-v9kIhKwjeZThiWrLmj0y17CWoyddASLj9O2yvbZkbvw/N3rWOYy9zkV66ursAoVr0mV15bL8g0c4QZUE6cdDoQ==", + "@eslint/eslintrc": { + "version": "0.4.3", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz", + "integrity": "sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==", "dev": true, "requires": { - "exec-sh": "^0.3.2", - "minimist": "^1.2.0" + "ajv": "^6.12.4", + "debug": "^4.1.1", + "espree": "^7.3.0", + "globals": "^13.9.0", + "ignore": "^4.0.6", + "import-fresh": "^3.2.1", + "js-yaml": "^3.13.1", + "minimatch": "^3.0.4", + "strip-json-comments": "^3.1.1" + }, + "dependencies": { + "debug": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", + "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", + "dev": true, + "requires": { + "ms": "2.1.2" + } + }, + "globals": { + "version": "13.11.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.11.0.tgz", + "integrity": "sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==", + "dev": true, + "requires": { + "type-fest": "^0.20.2" + } + }, + "ignore": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", + "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", + "dev": true + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "type-fest": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", + "dev": true + } } }, "@fast-csv/format": { @@ -1306,6 +1351,40 @@ } } }, + "@humanwhocodes/config-array": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.5.0.tgz", + "integrity": "sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==", + "dev": true, + "requires": { + "@humanwhocodes/object-schema": "^1.2.0", + "debug": "^4.1.1", + "minimatch": "^3.0.4" + }, + "dependencies": { + "debug": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", + "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", + "dev": true, + "requires": { + "ms": "2.1.2" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + } + } + }, + "@humanwhocodes/object-schema": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz", + "integrity": "sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w==", + "dev": true + }, "@istanbuljs/load-nyc-config": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", @@ -1374,61 +1453,51 @@ "dev": true }, "@jest/console": { - "version": "25.5.0", - "resolved": "https://registry.npmjs.org/@jest/console/-/console-25.5.0.tgz", - "integrity": "sha512-T48kZa6MK1Y6k4b89sexwmSF4YLeZS/Udqg3Jj3jG/cHH+N/sLFCEoXEDMOKugJQ9FxPN1osxIknvKkxt6MKyw==", + "version": "27.2.0", + "resolved": "https://registry.npmjs.org/@jest/console/-/console-27.2.0.tgz", + "integrity": "sha512-35z+RqsK2CCgNxn+lWyK8X4KkaDtfL4BggT7oeZ0JffIiAiEYFYPo5B67V50ZubqDS1ehBrdCR2jduFnIrZOYw==", "dev": true, "requires": { - "@jest/types": "^25.5.0", - "chalk": "^3.0.0", - "jest-message-util": "^25.5.0", - "jest-util": "^25.5.0", + "@jest/types": "^27.1.1", + "@types/node": "*", + "chalk": "^4.0.0", + "jest-message-util": "^27.2.0", + "jest-util": "^27.2.0", "slash": "^3.0.0" - }, - "dependencies": { - "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" - } - } } }, "@jest/core": { - "version": "25.5.4", - "resolved": "https://registry.npmjs.org/@jest/core/-/core-25.5.4.tgz", - "integrity": "sha512-3uSo7laYxF00Dg/DMgbn4xMJKmDdWvZnf89n8Xj/5/AeQ2dOQmn6b6Hkj/MleyzZWXpwv+WSdYWl4cLsy2JsoA==", + "version": "27.2.0", + "resolved": "https://registry.npmjs.org/@jest/core/-/core-27.2.0.tgz", + "integrity": "sha512-E/2NHhq+VMo18DpKkoty8Sjey8Kps5Cqa88A8NP757s6JjYqPdioMuyUBhDiIOGCdQByEp0ou3jskkTszMS0nw==", "dev": true, "requires": { - "@jest/console": "^25.5.0", - "@jest/reporters": "^25.5.1", - "@jest/test-result": "^25.5.0", - "@jest/transform": "^25.5.1", - "@jest/types": "^25.5.0", + "@jest/console": "^27.2.0", + "@jest/reporters": "^27.2.0", + "@jest/test-result": "^27.2.0", + "@jest/transform": "^27.2.0", + "@jest/types": "^27.1.1", + "@types/node": "*", "ansi-escapes": "^4.2.1", - "chalk": "^3.0.0", + "chalk": "^4.0.0", + "emittery": "^0.8.1", "exit": "^0.1.2", "graceful-fs": "^4.2.4", - "jest-changed-files": "^25.5.0", - "jest-config": "^25.5.4", - "jest-haste-map": "^25.5.1", - "jest-message-util": "^25.5.0", - "jest-regex-util": "^25.2.6", - "jest-resolve": "^25.5.1", - "jest-resolve-dependencies": "^25.5.4", - "jest-runner": "^25.5.4", - "jest-runtime": "^25.5.4", - "jest-snapshot": "^25.5.1", - "jest-util": "^25.5.0", - "jest-validate": "^25.5.0", - "jest-watcher": "^25.5.0", - "micromatch": "^4.0.2", + "jest-changed-files": "^27.1.1", + "jest-config": "^27.2.0", + "jest-haste-map": "^27.2.0", + "jest-message-util": "^27.2.0", + "jest-regex-util": "^27.0.6", + "jest-resolve": "^27.2.0", + "jest-resolve-dependencies": "^27.2.0", + "jest-runner": "^27.2.0", + "jest-runtime": "^27.2.0", + "jest-snapshot": "^27.2.0", + "jest-util": "^27.2.0", + "jest-validate": "^27.2.0", + "jest-watcher": "^27.2.0", + "micromatch": "^4.0.4", "p-each-series": "^2.1.0", - "realpath-native": "^2.0.0", "rimraf": "^3.0.0", "slash": "^3.0.0", "strip-ansi": "^6.0.0" @@ -1443,16 +1512,6 @@ "fill-range": "^7.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" - } - }, "fill-range": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", @@ -1487,15 +1546,6 @@ "glob": "^7.1.3" } }, - "strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", - "dev": true, - "requires": { - "ansi-regex": "^5.0.0" - } - }, "to-regex-range": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", @@ -1508,89 +1558,78 @@ } }, "@jest/environment": { - "version": "25.5.0", - "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-25.5.0.tgz", - "integrity": "sha512-U2VXPEqL07E/V7pSZMSQCvV5Ea4lqOlT+0ZFijl/i316cRMHvZ4qC+jBdryd+lmRetjQo0YIQr6cVPNxxK87mA==", + "version": "27.2.0", + "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-27.2.0.tgz", + "integrity": "sha512-iPWmQI0wRIYSZX3wKu4FXHK4eIqkfq6n1DCDJS+v3uby7SOXrHvX4eiTBuEdSvtDRMTIH2kjrSkjHf/F9JIYyQ==", "dev": true, "requires": { - "@jest/fake-timers": "^25.5.0", - "@jest/types": "^25.5.0", - "jest-mock": "^25.5.0" + "@jest/fake-timers": "^27.2.0", + "@jest/types": "^27.1.1", + "@types/node": "*", + "jest-mock": "^27.1.1" } }, "@jest/fake-timers": { - "version": "25.5.0", - "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-25.5.0.tgz", - "integrity": "sha512-9y2+uGnESw/oyOI3eww9yaxdZyHq7XvprfP/eeoCsjqKYts2yRlsHS/SgjPDV8FyMfn2nbMy8YzUk6nyvdLOpQ==", + "version": "27.2.0", + "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.2.0.tgz", + "integrity": "sha512-gSu3YHvQOoVaTWYGgHFB7IYFtcF2HBzX4l7s47VcjvkUgL4/FBnE20x7TNLa3W6ABERtGd5gStSwsA8bcn+c4w==", "dev": true, "requires": { - "@jest/types": "^25.5.0", - "jest-message-util": "^25.5.0", - "jest-mock": "^25.5.0", - "jest-util": "^25.5.0", - "lolex": "^5.0.0" + "@jest/types": "^27.1.1", + "@sinonjs/fake-timers": "^7.0.2", + "@types/node": "*", + "jest-message-util": "^27.2.0", + "jest-mock": "^27.1.1", + "jest-util": "^27.2.0" } }, "@jest/globals": { - "version": "25.5.2", - "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-25.5.2.tgz", - "integrity": "sha512-AgAS/Ny7Q2RCIj5kZ+0MuKM1wbF0WMLxbCVl/GOMoCNbODRdJ541IxJ98xnZdVSZXivKpJlNPIWa3QmY0l4CXA==", + "version": "27.2.0", + "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-27.2.0.tgz", + "integrity": "sha512-raqk9Gf9WC3hlBa57rmRmJfRl9hom2b+qEE/ifheMtwn5USH5VZxzrHHOZg0Zsd/qC2WJ8UtyTwHKQAnNlDMdg==", "dev": true, "requires": { - "@jest/environment": "^25.5.0", - "@jest/types": "^25.5.0", - "expect": "^25.5.0" + "@jest/environment": "^27.2.0", + "@jest/types": "^27.1.1", + "expect": "^27.2.0" } }, "@jest/reporters": { - "version": "25.5.1", - "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-25.5.1.tgz", - "integrity": "sha512-3jbd8pPDTuhYJ7vqiHXbSwTJQNavczPs+f1kRprRDxETeE3u6srJ+f0NPuwvOmk+lmunZzPkYWIFZDLHQPkviw==", + "version": "27.2.0", + "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-27.2.0.tgz", + "integrity": "sha512-7wfkE3iRTLaT0F51h1mnxH3nQVwDCdbfgXiLuCcNkF1FnxXLH9utHqkSLIiwOTV1AtmiE0YagHbOvx4rnMP/GA==", "dev": true, "requires": { "@bcoe/v8-coverage": "^0.2.3", - "@jest/console": "^25.5.0", - "@jest/test-result": "^25.5.0", - "@jest/transform": "^25.5.1", - "@jest/types": "^25.5.0", - "chalk": "^3.0.0", + "@jest/console": "^27.2.0", + "@jest/test-result": "^27.2.0", + "@jest/transform": "^27.2.0", + "@jest/types": "^27.1.1", + "chalk": "^4.0.0", "collect-v8-coverage": "^1.0.0", "exit": "^0.1.2", "glob": "^7.1.2", "graceful-fs": "^4.2.4", "istanbul-lib-coverage": "^3.0.0", - "istanbul-lib-instrument": "^4.0.0", + "istanbul-lib-instrument": "^4.0.3", "istanbul-lib-report": "^3.0.0", "istanbul-lib-source-maps": "^4.0.0", "istanbul-reports": "^3.0.2", - "jest-haste-map": "^25.5.1", - "jest-resolve": "^25.5.1", - "jest-util": "^25.5.0", - "jest-worker": "^25.5.0", - "node-notifier": "^6.0.0", + "jest-haste-map": "^27.2.0", + "jest-resolve": "^27.2.0", + "jest-util": "^27.2.0", + "jest-worker": "^27.2.0", "slash": "^3.0.0", "source-map": "^0.6.0", - "string-length": "^3.1.0", + "string-length": "^4.0.1", "terminal-link": "^2.0.0", - "v8-to-istanbul": "^4.1.3" - }, - "dependencies": { - "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" - } - } + "v8-to-istanbul": "^8.0.0" } }, "@jest/source-map": { - "version": "25.5.0", - "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-25.5.0.tgz", - "integrity": "sha512-eIGx0xN12yVpMcPaVpjXPnn3N30QGJCJQSkEDUt9x1fI1Gdvb07Ml6K5iN2hG7NmMP6FDmtPEssE3z6doOYUwQ==", + "version": "27.0.6", + "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-27.0.6.tgz", + "integrity": "sha512-Fek4mi5KQrqmlY07T23JRi0e7Z9bXTOOD86V/uS0EIW4PClvPDqZOyFlLpNJheS6QI0FNX1CgmPjtJ4EA/2M+g==", "dev": true, "requires": { "callsites": "^3.0.0", @@ -1599,49 +1638,47 @@ } }, "@jest/test-result": { - "version": "25.5.0", - "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-25.5.0.tgz", - "integrity": "sha512-oV+hPJgXN7IQf/fHWkcS99y0smKLU2czLBJ9WA0jHITLst58HpQMtzSYxzaBvYc6U5U6jfoMthqsUlUlbRXs0A==", + "version": "27.2.0", + "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-27.2.0.tgz", + "integrity": "sha512-JPPqn8h0RGr4HyeY1Km+FivDIjTFzDROU46iAvzVjD42ooGwYoqYO/MQTilhfajdz6jpVnnphFrKZI5OYrBONA==", "dev": true, "requires": { - "@jest/console": "^25.5.0", - "@jest/types": "^25.5.0", + "@jest/console": "^27.2.0", + "@jest/types": "^27.1.1", "@types/istanbul-lib-coverage": "^2.0.0", "collect-v8-coverage": "^1.0.0" } }, "@jest/test-sequencer": { - "version": "25.5.4", - "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-25.5.4.tgz", - "integrity": "sha512-pTJGEkSeg1EkCO2YWq6hbFvKNXk8ejqlxiOg1jBNLnWrgXOkdY6UmqZpwGFXNnRt9B8nO1uWMzLLZ4eCmhkPNA==", + "version": "27.2.0", + "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-27.2.0.tgz", + "integrity": "sha512-PrqarcpzOU1KSAK7aPwfL8nnpaqTMwPe7JBPnaOYRDSe/C6AoJiL5Kbnonqf1+DregxZIRAoDg69R9/DXMGqXA==", "dev": true, "requires": { - "@jest/test-result": "^25.5.0", + "@jest/test-result": "^27.2.0", "graceful-fs": "^4.2.4", - "jest-haste-map": "^25.5.1", - "jest-runner": "^25.5.4", - "jest-runtime": "^25.5.4" + "jest-haste-map": "^27.2.0", + "jest-runtime": "^27.2.0" } }, "@jest/transform": { - "version": "25.5.1", - "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-25.5.1.tgz", - "integrity": "sha512-Y8CEoVwXb4QwA6Y/9uDkn0Xfz0finGkieuV0xkdF9UtZGJeLukD5nLkaVrVsODB1ojRWlaoD0AJZpVHCSnJEvg==", + "version": "27.2.0", + "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-27.2.0.tgz", + "integrity": "sha512-Q8Q/8xXIZYllk1AF7Ou5sV3egOZsdY/Wlv09CSbcexBRcC1Qt6lVZ7jRFAZtbHsEEzvOCyFEC4PcrwKwyjXtCg==", "dev": true, "requires": { "@babel/core": "^7.1.0", - "@jest/types": "^25.5.0", + "@jest/types": "^27.1.1", "babel-plugin-istanbul": "^6.0.0", - "chalk": "^3.0.0", + "chalk": "^4.0.0", "convert-source-map": "^1.4.0", "fast-json-stable-stringify": "^2.0.0", "graceful-fs": "^4.2.4", - "jest-haste-map": "^25.5.1", - "jest-regex-util": "^25.2.6", - "jest-util": "^25.5.0", - "micromatch": "^4.0.2", + "jest-haste-map": "^27.2.0", + "jest-regex-util": "^27.0.6", + "jest-util": "^27.2.0", + "micromatch": "^4.0.4", "pirates": "^4.0.1", - "realpath-native": "^2.0.0", "slash": "^3.0.0", "source-map": "^0.6.1", "write-file-atomic": "^3.0.0" @@ -1656,16 +1693,6 @@ "fill-range": "^7.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" - } - }, "fill-range": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", @@ -1703,35 +1730,26 @@ } }, "@jest/types": { - "version": "25.5.0", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz", - "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-27.1.1.tgz", + "integrity": "sha512-yqJPDDseb0mXgKqmNqypCsb85C22K1aY5+LUxh7syIM9n/b0AsaltxNy+o6tt29VcfGDpYEve175bm3uOhcehA==", "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" + "@types/istanbul-reports": "^3.0.0", + "@types/node": "*", + "@types/yargs": "^16.0.0", + "chalk": "^4.0.0" }, "dependencies": { "@types/yargs": { - "version": "15.0.14", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.14.tgz", - "integrity": "sha512-yEJzHoxf6SyQGhBhIYGXQDSCkJjB6HohDShto7m8vaKg9Yp0Yn8+71J9eakh2bnPg6BfsH9PRMhiRTZnd4eXGQ==", + "version": "16.0.4", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz", + "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==", "dev": true, "requires": { "@types/yargs-parser": "*" } - }, - "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" - } } } }, @@ -1917,18 +1935,26 @@ } }, "@rollup/plugin-commonjs": { - "version": "11.1.0", - "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-11.1.0.tgz", - "integrity": "sha512-Ycr12N3ZPN96Fw2STurD21jMqzKwL9QuFhms3SD7KKRK7oaXUsBU9Zt0jL/rOPHiPYisI21/rXGO3jr9BnLHUA==", + "version": "15.1.0", + "resolved": "https://registry.npmjs.org/@rollup/plugin-commonjs/-/plugin-commonjs-15.1.0.tgz", + "integrity": "sha512-xCQqz4z/o0h2syQ7d9LskIMvBSH4PX5PjYdpSSvgS+pQik3WahkQVNWg3D8XJeYjZoVWnIUQYDghuEMRGrmQYQ==", "dev": true, "requires": { - "@rollup/pluginutils": "^3.0.8", + "@rollup/pluginutils": "^3.1.0", "commondir": "^1.0.1", - "estree-walker": "^1.0.1", - "glob": "^7.1.2", - "is-reference": "^1.1.2", - "magic-string": "^0.25.2", - "resolve": "^1.11.0" + "estree-walker": "^2.0.1", + "glob": "^7.1.6", + "is-reference": "^1.2.1", + "magic-string": "^0.25.7", + "resolve": "^1.17.0" + }, + "dependencies": { + "estree-walker": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz", + "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==", + "dev": true + } } }, "@rollup/plugin-json": { @@ -2351,6 +2377,15 @@ "type-detect": "4.0.8" } }, + "@sinonjs/fake-timers": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-7.1.2.tgz", + "integrity": "sha512-iQADsW4LBMISqZ6Ci1dupJL9pprqwcVFTcOsEmQOEhW+KLCVn/Y4Jrvg2k19fIHCp+iFprriYPTdRcQR8NbUPg==", + "dev": true, + "requires": { + "@sinonjs/commons": "^1.7.0" + } + }, "@size-limit/file": { "version": "5.0.3", "resolved": "https://registry.npmjs.org/@size-limit/file/-/file-5.0.3.tgz", @@ -2401,9 +2436,9 @@ "dev": true }, "@types/babel__core": { - "version": "7.1.15", - "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.15.tgz", - "integrity": "sha512-bxlMKPDbY8x5h6HBwVzEOk2C8fb6SLfYQ5Jw3uBYuYF1lfWk/kbLd81la82vrIkBb0l+JdmrZaDikPrNxpS/Ew==", + "version": "7.1.16", + "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.16.tgz", + "integrity": "sha512-EAEHtisTMM+KaKwfWdC3oyllIqswlznXCIVCt7/oRNrh+DhgT4UEBNC/jlADNjvw7UnfbcdkGQcPVZ1xYiLcrQ==", "dev": true, "requires": { "@babel/parser": "^7.1.0", @@ -2441,12 +2476,6 @@ "@babel/types": "^7.3.0" } }, - "@types/eslint-visitor-keys": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@types/eslint-visitor-keys/-/eslint-visitor-keys-1.0.0.tgz", - "integrity": "sha512-OCutwjDZ4aFS6PB1UZ988C4YgwlBHJd6wCeQqaLdmadZ/7e+w79+hbMUFC1QXDNCmdyoRfAFdm0RypzwR+Qpag==", - "dev": true - }, "@types/estree": { "version": "0.0.39", "resolved": "https://registry.npmjs.org/@types/estree/-/estree-0.0.39.tgz", @@ -2478,98 +2507,22 @@ } }, "@types/istanbul-reports": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz", - "integrity": "sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz", + "integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==", "dev": true, "requires": { - "@types/istanbul-lib-coverage": "*", "@types/istanbul-lib-report": "*" } }, "@types/jest": { - "version": "26.0.24", - "resolved": "https://registry.npmjs.org/@types/jest/-/jest-26.0.24.tgz", - "integrity": "sha512-E/X5Vib8BWqZNRlDxj9vYXhsDwPYbPINqKF9BsnSoon4RQ0D9moEuLD8txgyypFLH7J4+Lho9Nr/c8H0Fi+17w==", + "version": "27.0.1", + "resolved": "https://registry.npmjs.org/@types/jest/-/jest-27.0.1.tgz", + "integrity": "sha512-HTLpVXHrY69556ozYkcq47TtQJXpcWAWfkoqz+ZGz2JnmZhzlRjprCIyFnetSy8gpDWwTTGBcRVv1J1I1vBrHw==", "dev": true, "requires": { - "jest-diff": "^26.0.0", - "pretty-format": "^26.0.0" - }, - "dependencies": { - "@jest/types": { - "version": "26.6.2", - "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz", - "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==", - "dev": true, - "requires": { - "@types/istanbul-lib-coverage": "^2.0.0", - "@types/istanbul-reports": "^3.0.0", - "@types/node": "*", - "@types/yargs": "^15.0.0", - "chalk": "^4.0.0" - } - }, - "@types/istanbul-reports": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz", - "integrity": "sha512-c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw==", - "dev": true, - "requires": { - "@types/istanbul-lib-report": "*" - } - }, - "@types/yargs": { - "version": "15.0.14", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.14.tgz", - "integrity": "sha512-yEJzHoxf6SyQGhBhIYGXQDSCkJjB6HohDShto7m8vaKg9Yp0Yn8+71J9eakh2bnPg6BfsH9PRMhiRTZnd4eXGQ==", - "dev": true, - "requires": { - "@types/yargs-parser": "*" - } - }, - "diff-sequences": { - "version": "26.6.2", - "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.6.2.tgz", - "integrity": "sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q==", - "dev": true - }, - "jest-diff": { - "version": "26.6.2", - "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-26.6.2.tgz", - "integrity": "sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA==", - "dev": true, - "requires": { - "chalk": "^4.0.0", - "diff-sequences": "^26.6.2", - "jest-get-type": "^26.3.0", - "pretty-format": "^26.6.2" - } - }, - "jest-get-type": { - "version": "26.3.0", - "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz", - "integrity": "sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig==", - "dev": true - }, - "pretty-format": { - "version": "26.6.2", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz", - "integrity": "sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==", - "dev": true, - "requires": { - "@jest/types": "^26.6.2", - "ansi-regex": "^5.0.0", - "ansi-styles": "^4.0.0", - "react-is": "^17.0.1" - } - }, - "react-is": { - "version": "17.0.2", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", - "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==", - "dev": true - } + "jest-diff": "^27.0.0", + "pretty-format": "^27.0.0" } }, "@types/json-schema": { @@ -2585,9 +2538,9 @@ "dev": true }, "@types/lodash": { - "version": "4.14.172", - "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.172.tgz", - "integrity": "sha512-/BHF5HAx3em7/KkzVKm3LrsD6HZAXuXO1AJZQ3cRRBZj4oHZDviWPYu0aEplAqDFNHZPW6d3G7KN+ONcCCC7pw==", + "version": "4.14.173", + "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.173.tgz", + "integrity": "sha512-vv0CAYoaEjCw/mLy96GBTnRoZrSxkGE0BKzKimdR8P3OzrNYNvBgtW7p055A+E8C31vXNUhWKoFCbhq7gbyhFg==", "dev": true }, "@types/minimist": { @@ -2597,9 +2550,9 @@ "dev": true }, "@types/node": { - "version": "16.6.1", - "resolved": "https://registry.npmjs.org/@types/node/-/node-16.6.1.tgz", - "integrity": "sha512-Sr7BhXEAer9xyGuCN3Ek9eg9xPviCF2gfu9kTfuU2HkTVAMYSDeX40fvpmo72n5nansg3nsBjuQBrsS28r+NUw==", + "version": "16.9.2", + "resolved": "https://registry.npmjs.org/@types/node/-/node-16.9.2.tgz", + "integrity": "sha512-ZHty/hKoOLZvSz6BtP1g7tc7nUeJhoCf3flLjh8ZEv1vFKBWHXcnMbJMyN/pftSljNyy0kNW/UqI3DccnBnZ8w==", "dev": true }, "@types/normalize-package-data": { @@ -2615,9 +2568,9 @@ "dev": true }, "@types/prettier": { - "version": "1.19.1", - "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-1.19.1.tgz", - "integrity": "sha512-5qOlnZscTn4xxM5MeGXAMOsIOIKIbh9e85zJWfBRVPlRMEVawzoPhINYbRGkBZCI8LxvBe7tJCdWiarA99OZfQ==", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.3.2.tgz", + "integrity": "sha512-eI5Yrz3Qv4KPUa/nSIAi0h+qX0XyewOliug5F2QAtuRg6Kjg6jfmxe1GIwoIRhZspD1A0RP8ANrPwvEXXtRFog==", "dev": true }, "@types/resolve": { @@ -2636,9 +2589,9 @@ "dev": true }, "@types/stack-utils": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-1.0.1.tgz", - "integrity": "sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.1.tgz", + "integrity": "sha512-Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw==", "dev": true }, "@types/yargs": { @@ -2657,27 +2610,49 @@ "dev": true }, "@typescript-eslint/eslint-plugin": { - "version": "2.34.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.34.0.tgz", - "integrity": "sha512-4zY3Z88rEE99+CNvTbXSyovv2z9PNOVffTWD2W8QF5s2prBQtwN2zadqERcrHpcR7O/+KMI3fcTAmUUhK/iQcQ==", + "version": "4.31.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.31.1.tgz", + "integrity": "sha512-UDqhWmd5i0TvPLmbK5xY3UZB0zEGseF+DHPghZ37Sb83Qd3p8ujhvAtkU4OF46Ka5Pm5kWvFIx0cCTBFKo0alA==", "dev": true, "requires": { - "@typescript-eslint/experimental-utils": "2.34.0", + "@typescript-eslint/experimental-utils": "4.31.1", + "@typescript-eslint/scope-manager": "4.31.1", + "debug": "^4.3.1", "functional-red-black-tree": "^1.0.1", - "regexpp": "^3.0.0", - "tsutils": "^3.17.1" + "regexpp": "^3.1.0", + "semver": "^7.3.5", + "tsutils": "^3.21.0" + }, + "dependencies": { + "debug": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", + "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", + "dev": true, + "requires": { + "ms": "2.1.2" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + } } }, "@typescript-eslint/experimental-utils": { - "version": "2.34.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-2.34.0.tgz", - "integrity": "sha512-eS6FTkq+wuMJ+sgtuNTtcqavWXqsflWcfBnlYhg/nS4aZ1leewkXGbvBhaapn1q6qf4M71bsR1tez5JTRMuqwA==", + "version": "4.31.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.31.1.tgz", + "integrity": "sha512-NtoPsqmcSsWty0mcL5nTZXMf7Ei0Xr2MT8jWjXMVgRK0/1qeQ2jZzLFUh4QtyJ4+/lPUyMw5cSfeeME+Zrtp9Q==", "dev": true, "requires": { - "@types/json-schema": "^7.0.3", - "@typescript-eslint/typescript-estree": "2.34.0", - "eslint-scope": "^5.0.0", - "eslint-utils": "^2.0.0" + "@types/json-schema": "^7.0.7", + "@typescript-eslint/scope-manager": "4.31.1", + "@typescript-eslint/types": "4.31.1", + "@typescript-eslint/typescript-estree": "4.31.1", + "eslint-scope": "^5.1.1", + "eslint-utils": "^3.0.0" }, "dependencies": { "eslint-scope": { @@ -2693,30 +2668,63 @@ } }, "@typescript-eslint/parser": { - "version": "2.34.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-2.34.0.tgz", - "integrity": "sha512-03ilO0ucSD0EPTw2X4PntSIRFtDPWjrVq7C3/Z3VQHRC7+13YB55rcJI3Jt+YgeHbjUdJPcPa7b23rXCBokuyA==", + "version": "4.31.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-4.31.1.tgz", + "integrity": "sha512-dnVZDB6FhpIby6yVbHkwTKkn2ypjVIfAR9nh+kYsA/ZL0JlTsd22BiDjouotisY3Irmd3OW1qlk9EI5R8GrvRQ==", + "dev": true, + "requires": { + "@typescript-eslint/scope-manager": "4.31.1", + "@typescript-eslint/types": "4.31.1", + "@typescript-eslint/typescript-estree": "4.31.1", + "debug": "^4.3.1" + }, + "dependencies": { + "debug": { + "version": "4.3.2", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", + "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", + "dev": true, + "requires": { + "ms": "2.1.2" + } + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + } + } + }, + "@typescript-eslint/scope-manager": { + "version": "4.31.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.31.1.tgz", + "integrity": "sha512-N1Uhn6SqNtU2XpFSkD4oA+F0PfKdWHyr4bTX0xTj8NRx1314gBDRL1LUuZd5+L3oP+wo6hCbZpaa1in6SwMcVQ==", "dev": true, "requires": { - "@types/eslint-visitor-keys": "^1.0.0", - "@typescript-eslint/experimental-utils": "2.34.0", - "@typescript-eslint/typescript-estree": "2.34.0", - "eslint-visitor-keys": "^1.1.0" + "@typescript-eslint/types": "4.31.1", + "@typescript-eslint/visitor-keys": "4.31.1" } }, + "@typescript-eslint/types": { + "version": "4.31.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.31.1.tgz", + "integrity": "sha512-kixltt51ZJGKENNW88IY5MYqTBA8FR0Md8QdGbJD2pKZ+D5IvxjTYDNtJPDxFBiXmka2aJsITdB1BtO1fsgmsQ==", + "dev": true + }, "@typescript-eslint/typescript-estree": { - "version": "2.34.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-2.34.0.tgz", - "integrity": "sha512-OMAr+nJWKdlVM9LOqCqh3pQQPwxHAN7Du8DR6dmwCrAmxtiXQnhHJ6tBNtf+cggqfo51SG/FCwnKhXCIM7hnVg==", + "version": "4.31.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.31.1.tgz", + "integrity": "sha512-EGHkbsUvjFrvRnusk6yFGqrqMBTue5E5ROnS5puj3laGQPasVUgwhrxfcgkdHNFECHAewpvELE1Gjv0XO3mdWg==", "dev": true, "requires": { - "debug": "^4.1.1", - "eslint-visitor-keys": "^1.1.0", - "glob": "^7.1.6", + "@typescript-eslint/types": "4.31.1", + "@typescript-eslint/visitor-keys": "4.31.1", + "debug": "^4.3.1", + "globby": "^11.0.3", "is-glob": "^4.0.1", - "lodash": "^4.17.15", - "semver": "^7.3.2", - "tsutils": "^3.17.1" + "semver": "^7.3.5", + "tsutils": "^3.21.0" }, "dependencies": { "debug": { @@ -2736,6 +2744,16 @@ } } }, + "@typescript-eslint/visitor-keys": { + "version": "4.31.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.31.1.tgz", + "integrity": "sha512-PCncP8hEqKw6SOJY+3St4LVtoZpPPn+Zlpm7KW5xnviMhdqcsBty4Lsg4J/VECpJjw1CkROaZhH4B8M1OfnXTQ==", + "dev": true, + "requires": { + "@typescript-eslint/types": "4.31.1", + "eslint-visitor-keys": "^2.0.0" + } + }, "@webassemblyjs/ast": { "version": "1.9.0", "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.0.tgz", @@ -2946,19 +2964,25 @@ "dev": true }, "acorn-globals": { - "version": "4.3.4", - "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-4.3.4.tgz", - "integrity": "sha512-clfQEh21R+D0leSbUdWf3OcfqyaCSAQ8Ryq00bofSekfr9W8u1jyYZo6ir0xu9Gtcf7BjcHJpnbZH7JOCpP60A==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz", + "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==", "dev": true, "requires": { - "acorn": "^6.0.1", - "acorn-walk": "^6.0.1" + "acorn": "^7.1.1", + "acorn-walk": "^7.1.1" }, "dependencies": { + "acorn": { + "version": "7.4.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", + "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", + "dev": true + }, "acorn-walk": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-6.2.0.tgz", - "integrity": "sha512-7evsyfH1cLOCdAzZAd43Cic04yKydNx0cF+7tiA19p1XnLLPU4dpCQOqpjqwokFe//vS0QqfqqjCS2JkiIs0cA==", + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz", + "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==", "dev": true } } @@ -3177,12 +3201,6 @@ "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=", "dev": true }, - "array-equal": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/array-equal/-/array-equal-1.0.0.tgz", - "integrity": "sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=", - "dev": true - }, "array-ify": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/array-ify/-/array-ify-1.0.0.tgz", @@ -3243,15 +3261,6 @@ "integrity": "sha1-iYUI2iIm84DfkEcoRWhJwVAaSw0=", "dev": true }, - "asn1": { - "version": "0.2.4", - "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", - "integrity": "sha512-jxwzQpLQjSmWXgwaCZE9Nz+glAG01yF1QnWgbhGwHI5A6FRIEY6IVqtHhIepHqI7/kyEyQEagBC5mBEFlIYvdg==", - "dev": true, - "requires": { - "safer-buffer": "~2.1.0" - } - }, "asn1.js": { "version": "5.4.1", "resolved": "https://registry.npmjs.org/asn1.js/-/asn1.js-5.4.1.tgz", @@ -3299,12 +3308,6 @@ } } }, - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", - "dev": true - }, "assign-symbols": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz", @@ -3318,9 +3321,9 @@ "dev": true }, "astral-regex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz", - "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-2.0.0.tgz", + "integrity": "sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==", "dev": true }, "async": { @@ -3359,18 +3362,6 @@ "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==", "dev": true }, - "aws-sign2": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", - "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=", - "dev": true - }, - "aws4": { - "version": "1.11.0", - "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz", - "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA==", - "dev": true - }, "axe-core": { "version": "4.3.3", "resolved": "https://registry.npmjs.org/axe-core/-/axe-core-4.3.3.tgz", @@ -3395,34 +3386,30 @@ "@babel/types": "^7.7.0", "eslint-visitor-keys": "^1.0.0", "resolve": "^1.12.0" + }, + "dependencies": { + "eslint-visitor-keys": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", + "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", + "dev": true + } } }, "babel-jest": { - "version": "25.5.1", - "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-25.5.1.tgz", - "integrity": "sha512-9dA9+GmMjIzgPnYtkhBg73gOo/RHqPmLruP3BaGL4KEX3Dwz6pI8auSN8G8+iuEG90+GSswyKvslN+JYSaacaQ==", + "version": "27.2.0", + "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-27.2.0.tgz", + "integrity": "sha512-bS2p+KGGVVmWXBa8+i6SO/xzpiz2Q/2LnqLbQknPKefWXVZ67YIjA4iXup/jMOEZplga9PpWn+wrdb3UdDwRaA==", "dev": true, "requires": { - "@jest/transform": "^25.5.1", - "@jest/types": "^25.5.0", - "@types/babel__core": "^7.1.7", + "@jest/transform": "^27.2.0", + "@jest/types": "^27.1.1", + "@types/babel__core": "^7.1.14", "babel-plugin-istanbul": "^6.0.0", - "babel-preset-jest": "^25.5.0", - "chalk": "^3.0.0", + "babel-preset-jest": "^27.2.0", + "chalk": "^4.0.0", "graceful-fs": "^4.2.4", "slash": "^3.0.0" - }, - "dependencies": { - "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" - } - } } }, "babel-plugin-annotate-pure-calls": { @@ -3460,13 +3447,14 @@ } }, "babel-plugin-jest-hoist": { - "version": "25.5.0", - "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-25.5.0.tgz", - "integrity": "sha512-u+/W+WAjMlvoocYGTwthAiQSxDcJAyHpQ6oWlHdFZaaN+Rlk8Q7iiwDPg2lN/FyJtAYnKjFxbn7xus4HCFkg5g==", + "version": "27.2.0", + "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.2.0.tgz", + "integrity": "sha512-TOux9khNKdi64mW+0OIhcmbAn75tTlzKhxmiNXevQaPbrBYK7YKjP1jl6NHTJ6XR5UgUrJbCnWlKVnJn29dfjw==", "dev": true, "requires": { "@babel/template": "^7.3.3", "@babel/types": "^7.3.3", + "@types/babel__core": "^7.0.0", "@types/babel__traverse": "^7.0.6" } }, @@ -3511,51 +3499,12 @@ } }, "babel-plugin-polyfill-regenerator": { - "version": "0.0.4", - "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.0.4.tgz", - "integrity": "sha512-+/uCzO9JTYVZVGCpZpVAQkgPGt2zkR0VYiZvJ4aVoCe4ccgpKvNQqcjzAgQzSsjK64Jhc5hvrCR3l0087BevkA==", + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.2.tgz", + "integrity": "sha512-Goy5ghsc21HgPDFtzRkSirpZVW35meGoTmTOb2bxqdl60ghub4xOidgNTHaZfQ2FaxQsKmwvXtOAkcIS4SMBWg==", "dev": true, "requires": { - "@babel/helper-define-polyfill-provider": "^0.0.3" - }, - "dependencies": { - "@babel/helper-define-polyfill-provider": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.0.3.tgz", - "integrity": "sha512-dULDd/APiP4JowYDAMosecKOi/1v+UId99qhBGiO3myM29KtAVKS/R3x3OJJNBR0FeYB1BcYb2dCwkhqvxWXXQ==", - "dev": true, - "requires": { - "@babel/helper-compilation-targets": "^7.10.4", - "@babel/helper-module-imports": "^7.10.4", - "@babel/helper-plugin-utils": "^7.10.4", - "@babel/traverse": "^7.11.5", - "debug": "^4.1.1", - "lodash.debounce": "^4.0.8", - "resolve": "^1.14.2", - "semver": "^6.1.2" - } - }, - "debug": { - "version": "4.3.2", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", - "integrity": "sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==", - "dev": true, - "requires": { - "ms": "2.1.2" - } - }, - "ms": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", - "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", - "dev": true - }, - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true - } + "@babel/helper-define-polyfill-provider": "^0.2.2" } }, "babel-plugin-transform-rename-import": { @@ -3565,9 +3514,9 @@ "dev": true }, "babel-preset-current-node-syntax": { - "version": "0.1.4", - "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-0.1.4.tgz", - "integrity": "sha512-5/INNCYhUGqw7VbVjT/hb3ucjgkVHKXY7lX3ZjlN4gm565VyFmJUrJ/h+h16ECVB38R/9SF6aACydpKMLZ/c9w==", + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.1.tgz", + "integrity": "sha512-M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ==", "dev": true, "requires": { "@babel/plugin-syntax-async-generators": "^7.8.4", @@ -3580,17 +3529,18 @@ "@babel/plugin-syntax-numeric-separator": "^7.8.3", "@babel/plugin-syntax-object-rest-spread": "^7.8.3", "@babel/plugin-syntax-optional-catch-binding": "^7.8.3", - "@babel/plugin-syntax-optional-chaining": "^7.8.3" + "@babel/plugin-syntax-optional-chaining": "^7.8.3", + "@babel/plugin-syntax-top-level-await": "^7.8.3" } }, "babel-preset-jest": { - "version": "25.5.0", - "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-25.5.0.tgz", - "integrity": "sha512-8ZczygctQkBU+63DtSOKGh7tFL0CeCuz+1ieud9lJ1WPQ9O6A1a/r+LGn6Y705PA6whHQ3T1XuB/PmpfNYf8Fw==", + "version": "27.2.0", + "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-27.2.0.tgz", + "integrity": "sha512-z7MgQ3peBwN5L5aCqBKnF6iqdlvZvFUQynEhu0J+X9nHLU72jO3iY331lcYrg+AssJ8q7xsv5/3AICzVmJ/wvg==", "dev": true, "requires": { - "babel-plugin-jest-hoist": "^25.5.0", - "babel-preset-current-node-syntax": "^0.1.2" + "babel-plugin-jest-hoist": "^27.2.0", + "babel-preset-current-node-syntax": "^1.0.0" } }, "balanced-match": { @@ -3658,15 +3608,6 @@ "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==" }, - "bcrypt-pbkdf": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", - "integrity": "sha1-pDAdOJtqQ/m2f/PKEaP2Y342Dp4=", - "dev": true, - "requires": { - "tweetnacl": "^0.14.3" - } - }, "before-after-hook": { "version": "2.2.2", "resolved": "https://registry.npmjs.org/before-after-hook/-/before-after-hook-2.2.2.tgz", @@ -3804,23 +3745,6 @@ "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==", "dev": true }, - "browser-resolve": { - "version": "1.11.3", - "resolved": "https://registry.npmjs.org/browser-resolve/-/browser-resolve-1.11.3.tgz", - "integrity": "sha512-exDi1BYWB/6raKHmDTCicQfTkqwN5fioMFV4j8BsfMU4R2DK/QfZfK7kOVkmWCNANf0snkBzqGqAJBao9gZMdQ==", - "dev": true, - "requires": { - "resolve": "1.1.7" - }, - "dependencies": { - "resolve": { - "version": "1.1.7", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz", - "integrity": "sha1-IDEU2CrSxe2ejgQRs5ModeiJ6Xs=", - "dev": true - } - } - }, "browserify-aes": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/browserify-aes/-/browserify-aes-1.2.0.tgz", @@ -4125,15 +4049,6 @@ "integrity": "sha512-vcX4U8lwVXPdqzPWi6cAJ3FnQaqXbBqy/GZseKNQzRj37J7qZdGcBtxq/QLFNLLlfsoXLUdHw8Iwenri86Tagw==", "dev": true }, - "capture-exit": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/capture-exit/-/capture-exit-2.0.0.tgz", - "integrity": "sha512-PiT/hQmTonHhl/HFGN+Lx3JJUznrVYJ3+AQsnthneZbvW7x+f08Tk7yLJTLEOUvBTbduLeeBkxEaYXUOUrRq6g==", - "dev": true, - "requires": { - "rsvp": "^4.8.4" - } - }, "cardinal": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/cardinal/-/cardinal-2.1.1.tgz", @@ -4144,12 +4059,6 @@ "redeyed": "~2.1.0" } }, - "caseless": { - "version": "0.12.0", - "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", - "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=", - "dev": true - }, "chainsaw": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/chainsaw/-/chainsaw-0.1.0.tgz", @@ -4168,10 +4077,10 @@ "supports-color": "^7.1.0" } }, - "chardet": { - "version": "0.7.0", - "resolved": "https://registry.npmjs.org/chardet/-/chardet-0.7.0.tgz", - "integrity": "sha512-mT8iDcrh03qDGRRmoA2hmBJnxpllMR+0/0qlzjqZES6NdiWDcZkCNAk4rPFZ9Q85r27unkiNNg8ZOiwZXBHwcA==", + "char-regex": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-1.0.2.tgz", + "integrity": "sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw==", "dev": true }, "chokidar": { @@ -4238,9 +4147,9 @@ "dev": true }, "ci-info": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz", - "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==", + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-3.2.0.tgz", + "integrity": "sha512-dVqRX7fLUm8J6FgHJ418XuIgDLZDkYcDFTeL6TA2gt5WlIZUQrrH6EZrNClwT/H0FateUsZkGIOPRrLbP+PR9A==", "dev": true }, "ci-job-number": { @@ -4259,6 +4168,12 @@ "safe-buffer": "^5.0.1" } }, + "cjs-module-lexer": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.2.2.tgz", + "integrity": "sha512-cOU9usZw8/dXIXKtwa8pM0OTJQuJkxMN6w30csNRUerHfeQ5R6U3kkU/FtJeIf3M202OHfY2U8ccInBG7/xogA==", + "dev": true + }, "class-utils": { "version": "0.3.6", "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz", @@ -4312,12 +4227,6 @@ "colors": "1.0.3" } }, - "cli-width": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/cli-width/-/cli-width-3.0.0.tgz", - "integrity": "sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==", - "dev": true - }, "cliui": { "version": "7.0.4", "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", @@ -4636,44 +4545,44 @@ "dev": true }, "core-js-compat": { - "version": "3.16.3", - "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.16.3.tgz", - "integrity": "sha512-A/OtSfSJQKLAFRVd4V0m6Sep9lPdjD8bpN8v3tCCGwE0Tmh0hOiVDm9tw6mXmWOKOSZIyr3EkywPo84cJjGvIQ==", + "version": "3.17.3", + "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.17.3.tgz", + "integrity": "sha512-+in61CKYs4hQERiADCJsdgewpdl/X0GhEX77pjKgbeibXviIt2oxEjTc8O2fqHX8mDdBrDvX8MYD/RYsBv4OiA==", "dev": true, "requires": { - "browserslist": "^4.16.8", + "browserslist": "^4.17.0", "semver": "7.0.0" }, "dependencies": { "browserslist": { - "version": "4.16.8", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.8.tgz", - "integrity": "sha512-sc2m9ohR/49sWEbPj14ZSSZqp+kbi16aLao42Hmn3Z8FpjuMaq2xCA2l4zl9ITfyzvnvyE0hcg62YkIGKxgaNQ==", + "version": "4.17.0", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.17.0.tgz", + "integrity": "sha512-g2BJ2a0nEYvEFQC208q8mVAhfNwpZ5Mu8BwgtCdZKO3qx98HChmeg448fPdUzld8aFmfLgVh7yymqV+q1lJZ5g==", "dev": true, "requires": { - "caniuse-lite": "^1.0.30001251", + "caniuse-lite": "^1.0.30001254", "colorette": "^1.3.0", - "electron-to-chromium": "^1.3.811", + "electron-to-chromium": "^1.3.830", "escalade": "^3.1.1", "node-releases": "^1.1.75" } }, "caniuse-lite": { - "version": "1.0.30001252", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001252.tgz", - "integrity": "sha512-I56jhWDGMtdILQORdusxBOH+Nl/KgQSdDmpJezYddnAkVOmnoU8zwjTV9xAjMIYxr0iPreEAVylCGcmHCjfaOw==", + "version": "1.0.30001257", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001257.tgz", + "integrity": "sha512-JN49KplOgHSXpIsVSF+LUyhD8PUp6xPpAXeRrrcBh4KBeP7W864jHn6RvzJgDlrReyeVjMFJL3PLpPvKIxlIHA==", "dev": true }, "colorette": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.3.0.tgz", - "integrity": "sha512-ecORCqbSFP7Wm8Y6lyqMJjexBQqXSF7SSeaTyGGphogUjBlFP9m9o08wy86HL2uB7fMTxtOUzLMk7ogKcxMg1w==", + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.4.0.tgz", + "integrity": "sha512-Y2oEozpomLn7Q3HFP7dpww7AtMJplbM9lGZP6RDfHqmbeRjiwRg4n6VM6j4KLmRke85uWEI7JqF17f3pqdRA0g==", "dev": true }, "electron-to-chromium": { - "version": "1.3.822", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.822.tgz", - "integrity": "sha512-k7jG5oYYHxF4jx6PcqwHX3JVME/OjzolqOZiIogi9xtsfsmTjTdie4x88OakYFPEa8euciTgCCzvVNwvmjHb1Q==", + "version": "1.3.839", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.839.tgz", + "integrity": "sha512-0O7uPs9LJNjQ/U5mW78qW8gXv9H6Ba3DHZ5/yt8aBsvomOWDkV3MddT7enUYvLQEUVOURjWmgJJWVZ3K98tIwQ==", "dev": true }, "node-releases": { @@ -4691,9 +4600,9 @@ } }, "core-js-pure": { - "version": "3.16.3", - "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.16.3.tgz", - "integrity": "sha512-6In+2RwN0FT5yK0ZnhDP5rco/NnuuFZhHauQizZiHo5lDnqAvq8Phxcpy3f+prJOqtKodt/cftBl/GTOW0kiqQ==", + "version": "3.17.3", + "resolved": "https://registry.npmjs.org/core-js-pure/-/core-js-pure-3.17.3.tgz", + "integrity": "sha512-YusrqwiOTTn8058JDa0cv9unbXdIiIgcgI9gXso0ey4WgkFLd3lYlV9rp9n7nDCsYxXsMDTjA4m1h3T348mdlQ==", "dev": true }, "core-util-is": { @@ -4790,24 +4699,14 @@ } }, "cross-spawn": { - "version": "6.0.5", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", - "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", "dev": true, "requires": { - "nice-try": "^1.0.4", - "path-key": "^2.0.1", - "semver": "^5.5.0", - "shebang-command": "^1.2.0", - "which": "^1.2.9" - }, - "dependencies": { - "semver": { - "version": "5.7.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", - "integrity": "sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==", - "dev": true - } + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" } }, "crypto-browserify": { @@ -5002,24 +4901,15 @@ "integrity": "sha512-VvdQIPGdWP0SqFXghj79Wf/5LArmreyMsGLa6FG6iC4t3j7j5s71TrwWmT/4akbDQIqjfACkLZmjXhA7g2oUZw==", "dev": true }, - "dashdash": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", - "integrity": "sha1-hTz6D3y+L+1d4gMmuN1YEDX24vA=", - "dev": true, - "requires": { - "assert-plus": "^1.0.0" - } - }, "data-urls": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-1.1.0.tgz", - "integrity": "sha512-YTWYI9se1P55u58gL5GkQHW4P6VJBJ5iBT+B5a7i2Tjadhv52paJG0qHX4A0OR6/t52odI64KP2YvFpkDOi3eQ==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz", + "integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==", "dev": true, "requires": { - "abab": "^2.0.0", - "whatwg-mimetype": "^2.2.0", - "whatwg-url": "^7.0.0" + "abab": "^2.0.3", + "whatwg-mimetype": "^2.3.0", + "whatwg-url": "^8.0.0" } }, "dateformat": { @@ -5066,12 +4956,24 @@ } } }, + "decimal.js": { + "version": "10.3.1", + "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.3.1.tgz", + "integrity": "sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ==", + "dev": true + }, "decode-uri-component": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz", "integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=", "dev": true }, + "dedent": { + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/dedent/-/dedent-0.7.0.tgz", + "integrity": "sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw=", + "dev": true + }, "deep-extend": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", @@ -5079,9 +4981,9 @@ "dev": true }, "deep-is": { - "version": "0.1.3", - "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz", - "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=", + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", + "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", "dev": true }, "deepmerge": { @@ -5205,9 +5107,9 @@ "dev": true }, "diff-sequences": { - "version": "25.2.6", - "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-25.2.6.tgz", - "integrity": "sha512-Hq8o7+6GaZeoFjtpgvRBUknSXNeJiCx7V9Fr94ZMljNiCr9n9L8H8aJqgWOQiDDGdyn29fRNcDdRVJ5fdyihfg==", + "version": "27.0.6", + "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.0.6.tgz", + "integrity": "sha512-ag6wfpBFyNXZ0p8pcuIDS//D8H062ZQJ3fzYxjpmeKjnz8W4pekL3AI8VohmyZmsWW2PWaHgjsmqR6L13101VQ==", "dev": true }, "diffie-hellman": { @@ -5271,12 +5173,20 @@ "dev": true }, "domexception": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/domexception/-/domexception-1.0.1.tgz", - "integrity": "sha512-raigMkn7CJNNo6Ihro1fzG7wr3fHuYVytzquZKX5n0yizGsTcYgzdIUwj1X9pK0VvjeihV+XiclP+DjwbsSKug==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz", + "integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==", "dev": true, "requires": { - "webidl-conversions": "^4.0.2" + "webidl-conversions": "^5.0.0" + }, + "dependencies": { + "webidl-conversions": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-5.0.0.tgz", + "integrity": "sha512-VlZwKPCkYKxQgeSbH5EyngOmRp7Ww7I9rQLERETtf5ofd9pGeswWiOtogpEO850jziPRarreGxn5QIiTqpb2wA==", + "dev": true + } } }, "domhandler": { @@ -5308,6 +5218,90 @@ "is-obj": "^2.0.0" } }, + "dts-cli": { + "version": "0.17.1", + "resolved": "https://registry.npmjs.org/dts-cli/-/dts-cli-0.17.1.tgz", + "integrity": "sha512-1Q+Fh+Z2G5gLcgWz/jqP3QTUYRPFO/cBs8JeKpBB2NfCWkkcUTE2DPR59x6r/F/UhbP3x4pN8JiQ0Gc99WZdpg==", + "dev": true, + "requires": { + "@babel/core": "^7.15.5", + "@babel/helper-module-imports": "^7.15.4", + "@babel/parser": "^7.15.6", + "@babel/plugin-proposal-class-properties": "^7.14.5", + "@babel/preset-env": "^7.15.6", + "@babel/traverse": "^7.15.4", + "@rollup/plugin-babel": "^5.3.0", + "@rollup/plugin-commonjs": "^15.1.0", + "@rollup/plugin-json": "^4.1.0", + "@rollup/plugin-node-resolve": "^9.0.0", + "@rollup/plugin-replace": "^2.4.2", + "@types/jest": "^27.0.1", + "@typescript-eslint/eslint-plugin": "^4.31.0", + "@typescript-eslint/parser": "^4.31.0", + "ansi-escapes": "^4.3.2", + "asyncro": "^3.0.0", + "babel-eslint": "^10.1.0", + "babel-plugin-annotate-pure-calls": "^0.4.0", + "babel-plugin-dev-expression": "^0.2.2", + "babel-plugin-macros": "^2.8.0", + "babel-plugin-polyfill-regenerator": "^0.2.2", + "babel-plugin-transform-rename-import": "^2.3.0", + "camelcase": "^6.2.0", + "chalk": "^4.1.2", + "enquirer": "^2.3.6", + "eslint": "^7.32.0", + "eslint-config-prettier": "^8.3.0", + "eslint-config-react-app": "^6.0.0", + "eslint-plugin-flowtype": "^5.9.2", + "eslint-plugin-import": "^2.24.2", + "eslint-plugin-jsx-a11y": "^6.4.1", + "eslint-plugin-prettier": "^4.0.0", + "eslint-plugin-react": "^7.25.1", + "eslint-plugin-react-hooks": "^4.2.0", + "execa": "^4.1.0", + "figlet": "^1.5.2", + "fs-extra": "^9.1.0", + "jest": "^27.1.1", + "jest-watch-typeahead": "^0.5.0", + "jpjs": "^1.2.1", + "lodash.merge": "^4.6.2", + "ora": "^5.4.1", + "pascal-case": "^3.1.2", + "prettier": "2.4.0", + "progress-estimator": "^0.3.0", + "regenerator-runtime": "^0.13.9", + "rollup": "^2.56.3", + "rollup-plugin-sourcemaps": "^0.6.3", + "rollup-plugin-terser": "^7.0.2", + "rollup-plugin-typescript2": "^0.27.3", + "sade": "^1.7.4", + "semver": "^7.3.5", + "shelljs": "^0.8.4", + "tiny-glob": "^0.2.9", + "ts-jest": "^27.0.5", + "tslib": "^2.3.1", + "type-fest": "^2.3.2", + "typescript": "^4.4.3" + }, + "dependencies": { + "@types/jest": { + "version": "27.0.1", + "resolved": "https://registry.npmjs.org/@types/jest/-/jest-27.0.1.tgz", + "integrity": "sha512-HTLpVXHrY69556ozYkcq47TtQJXpcWAWfkoqz+ZGz2JnmZhzlRjprCIyFnetSy8gpDWwTTGBcRVv1J1I1vBrHw==", + "dev": true, + "requires": { + "jest-diff": "^27.0.0", + "pretty-format": "^27.0.0" + } + }, + "type-fest": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.3.2.tgz", + "integrity": "sha512-cfvZ1nOC/VqAt8bVOIlFz8x+HdDASpiFYrSi0U0nzcAFlOnzzQ/gsPg2PP1uqjreO7sQCtraYJHMduXSewQsSA==", + "dev": true + } + } + }, "duplexer": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/duplexer/-/duplexer-0.1.2.tgz", @@ -5334,16 +5328,6 @@ "stream-shift": "^1.0.0" } }, - "ecc-jsbn": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz", - "integrity": "sha1-OoOpBOVDUyh4dMVkt1SThoSamMk=", - "dev": true, - "requires": { - "jsbn": "~0.1.0", - "safer-buffer": "^2.1.0" - } - }, "electron-to-chromium": { "version": "1.3.799", "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.799.tgz", @@ -5373,6 +5357,12 @@ } } }, + "emittery": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.8.1.tgz", + "integrity": "sha512-uDfvUjVrfGJJhymx/kz6prltenw1u7WrCg1oa94zYY8xxVpLLUu045LAT0dhDZdXG58/EpPL/5kA180fQ/qudg==", + "dev": true + }, "emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", @@ -5459,22 +5449,23 @@ } }, "es-abstract": { - "version": "1.18.5", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.5.tgz", - "integrity": "sha512-DDggyJLoS91CkJjgauM5c0yZMjiD1uK3KcaCeAmffGwZ+ODWzOkPN4QwRbsK5DOFf06fywmyLci3ZD8jLGhVYA==", + "version": "1.18.6", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.6.tgz", + "integrity": "sha512-kAeIT4cku5eNLNuUKhlmtuk1/TRZvQoYccn6TO0cSVdf1kzB0T7+dYuVK9MWM7l+/53W2Q8M7N2c6MQvhXFcUQ==", "dev": true, "requires": { "call-bind": "^1.0.2", "es-to-primitive": "^1.2.1", "function-bind": "^1.1.1", "get-intrinsic": "^1.1.1", + "get-symbol-description": "^1.0.0", "has": "^1.0.3", "has-symbols": "^1.0.2", "internal-slot": "^1.0.3", - "is-callable": "^1.2.3", + "is-callable": "^1.2.4", "is-negative-zero": "^2.0.1", - "is-regex": "^1.1.3", - "is-string": "^1.0.6", + "is-regex": "^1.1.4", + "is-string": "^1.0.7", "object-inspect": "^1.11.0", "object-keys": "^1.1.1", "object.assign": "^4.1.2", @@ -5506,98 +5497,122 @@ "dev": true }, "escodegen": { - "version": "1.14.3", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz", - "integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.0.0.tgz", + "integrity": "sha512-mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw==", "dev": true, "requires": { "esprima": "^4.0.1", - "estraverse": "^4.2.0", + "estraverse": "^5.2.0", "esutils": "^2.0.2", "optionator": "^0.8.1", "source-map": "~0.6.1" - } - }, - "eslint": { - "version": "6.8.0", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-6.8.0.tgz", - "integrity": "sha512-K+Iayyo2LtyYhDSYwz5D5QdWw0hCacNzyq1Y821Xna2xSJj7cijoLLYmLxTQgcgZ9mC61nryMy9S7GRbYpI5Ig==", - "dev": true, + }, + "dependencies": { + "estraverse": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", + "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==", + "dev": true + }, + "levn": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", + "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", + "dev": true, + "requires": { + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2" + } + }, + "optionator": { + "version": "0.8.3", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz", + "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==", + "dev": true, + "requires": { + "deep-is": "~0.1.3", + "fast-levenshtein": "~2.0.6", + "levn": "~0.3.0", + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2", + "word-wrap": "~1.2.3" + } + }, + "prelude-ls": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", + "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=", + "dev": true + }, + "type-check": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", + "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", + "dev": true, + "requires": { + "prelude-ls": "~1.1.2" + } + } + } + }, + "eslint": { + "version": "7.32.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.32.0.tgz", + "integrity": "sha512-VHZ8gX+EDfz+97jGcgyGCyRia/dPOd6Xh9yPv8Bl1+SoaIwD+a/vlrOmGRUyOYu7MwUhc7CxqeaDZU13S4+EpA==", + "dev": true, "requires": { - "@babel/code-frame": "^7.0.0", + "@babel/code-frame": "7.12.11", + "@eslint/eslintrc": "^0.4.3", + "@humanwhocodes/config-array": "^0.5.0", "ajv": "^6.10.0", - "chalk": "^2.1.0", - "cross-spawn": "^6.0.5", + "chalk": "^4.0.0", + "cross-spawn": "^7.0.2", "debug": "^4.0.1", "doctrine": "^3.0.0", - "eslint-scope": "^5.0.0", - "eslint-utils": "^1.4.3", - "eslint-visitor-keys": "^1.1.0", - "espree": "^6.1.2", - "esquery": "^1.0.1", + "enquirer": "^2.3.5", + "escape-string-regexp": "^4.0.0", + "eslint-scope": "^5.1.1", + "eslint-utils": "^2.1.0", + "eslint-visitor-keys": "^2.0.0", + "espree": "^7.3.1", + "esquery": "^1.4.0", "esutils": "^2.0.2", - "file-entry-cache": "^5.0.1", + "fast-deep-equal": "^3.1.3", + "file-entry-cache": "^6.0.1", "functional-red-black-tree": "^1.0.1", - "glob-parent": "^5.0.0", - "globals": "^12.1.0", + "glob-parent": "^5.1.2", + "globals": "^13.6.0", "ignore": "^4.0.6", "import-fresh": "^3.0.0", "imurmurhash": "^0.1.4", - "inquirer": "^7.0.0", "is-glob": "^4.0.0", "js-yaml": "^3.13.1", "json-stable-stringify-without-jsonify": "^1.0.1", - "levn": "^0.3.0", - "lodash": "^4.17.14", + "levn": "^0.4.1", + "lodash.merge": "^4.6.2", "minimatch": "^3.0.4", - "mkdirp": "^0.5.1", "natural-compare": "^1.4.0", - "optionator": "^0.8.3", + "optionator": "^0.9.1", "progress": "^2.0.0", - "regexpp": "^2.0.1", - "semver": "^6.1.2", - "strip-ansi": "^5.2.0", - "strip-json-comments": "^3.0.1", - "table": "^5.2.3", + "regexpp": "^3.1.0", + "semver": "^7.2.1", + "strip-ansi": "^6.0.0", + "strip-json-comments": "^3.1.0", + "table": "^6.0.9", "text-table": "^0.2.0", "v8-compile-cache": "^2.0.3" }, "dependencies": { - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "@babel/code-frame": { + "version": "7.12.11", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.11.tgz", + "integrity": "sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw==", "dev": true, "requires": { - "color-name": "1.1.3" + "@babel/highlight": "^7.10.4" } }, - "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", - "dev": true - }, "debug": { "version": "4.3.2", "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.2.tgz", @@ -5607,12 +5622,6 @@ "ms": "2.1.2" } }, - "escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", - "dev": true - }, "eslint-scope": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", @@ -5624,95 +5633,64 @@ } }, "eslint-utils": { - "version": "1.4.3", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-1.4.3.tgz", - "integrity": "sha512-fbBN5W2xdY45KulGXmLHZ3c3FHfVYmKg0IrAKGOkT/464PQsx2UeIzfz1RmEci+KLm1bBaAzZAh8+/E+XAeZ8Q==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", + "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", "dev": true, "requires": { "eslint-visitor-keys": "^1.1.0" + }, + "dependencies": { + "eslint-visitor-keys": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", + "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", + "dev": true + } } }, "globals": { - "version": "12.4.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz", - "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==", + "version": "13.11.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.11.0.tgz", + "integrity": "sha512-08/xrJ7wQjK9kkkRoI3OFUBbLx4f+6x3SGwcPvQ0QH6goFDrOU2oyAWrmh3dJezu65buo+HBMzAMQy6rovVC3g==", "dev": true, "requires": { - "type-fest": "^0.8.1" + "type-fest": "^0.20.2" } }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true - }, "ignore": { "version": "4.0.6", "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", "dev": true }, - "mkdirp": { - "version": "0.5.5", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", - "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", - "dev": true, - "requires": { - "minimist": "^1.2.5" - } - }, "ms": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", "dev": true }, - "regexpp": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-2.0.1.tgz", - "integrity": "sha512-lv0M6+TkDVniA3aD1Eg0DVpfU/booSu7Eev3TDO/mZKHBfVjgCGTV4t4buppESEYDtkArYFOxTJWv6S5C+iaNw==", - "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": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - }, "type-fest": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", - "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", "dev": true } } }, "eslint-config-prettier": { - "version": "6.15.0", - "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-6.15.0.tgz", - "integrity": "sha512-a1+kOYLR8wMGustcgAjdydMsQ2A/2ipRPwRKUmfYaSxc9ZPcrku080Ctl6zrZzZNs/U82MjSv+qKREkoq3bJaw==", - "dev": true, - "requires": { - "get-stdin": "^6.0.0" - } + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz", + "integrity": "sha512-BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew==", + "dev": true }, "eslint-config-react-app": { - "version": "5.2.1", - "resolved": "https://registry.npmjs.org/eslint-config-react-app/-/eslint-config-react-app-5.2.1.tgz", - "integrity": "sha512-pGIZ8t0mFLcV+6ZirRgYK6RVqUIKRIi9MmgzUEmrIknsn3AdO0I32asO86dJgloHq+9ZPl8UIg8mYrvgP5u2wQ==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/eslint-config-react-app/-/eslint-config-react-app-6.0.0.tgz", + "integrity": "sha512-bpoAAC+YRfzq0dsTk+6v9aHm/uqnDwayNAXleMypGl6CpxI9oXXscVHo4fk3eJPIn+rsbtNetB4r/ZIidFIE8A==", "dev": true, "requires": { - "confusing-browser-globals": "^1.0.9" + "confusing-browser-globals": "^1.0.10" } }, "eslint-import-resolver-node": { @@ -5822,12 +5800,13 @@ } }, "eslint-plugin-flowtype": { - "version": "3.13.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-flowtype/-/eslint-plugin-flowtype-3.13.0.tgz", - "integrity": "sha512-bhewp36P+t7cEV0b6OdmoRWJCBYRiHFlqPZAG1oS3SF+Y0LQkeDvFSM4oxoxvczD1OdONCXMlJfQFiWLcV9urw==", + "version": "5.10.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-flowtype/-/eslint-plugin-flowtype-5.10.0.tgz", + "integrity": "sha512-vcz32f+7TP+kvTUyMXZmCnNujBQZDNmcqPImw8b9PZ+16w1Qdm6ryRuYZYVaG9xRqqmAPr2Cs9FAX5gN+x/bjw==", "dev": true, "requires": { - "lodash": "^4.17.15" + "lodash": "^4.17.15", + "string-natural-compare": "^3.0.1" } }, "eslint-plugin-import": { @@ -5935,23 +5914,24 @@ } }, "eslint-plugin-prettier": { - "version": "3.4.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-3.4.1.tgz", - "integrity": "sha512-htg25EUYUeIhKHXjOinK4BgCcDwtLHjqaxCDsMy5nbnUMkKFvIhMVCp+5GFUXQ4Nr8lBsPqtGAqBenbpFqAA2g==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-4.0.0.tgz", + "integrity": "sha512-98MqmCJ7vJodoQK359bqQWaxOE0CS8paAz/GgjaZLyex4TTk3g9HugoO89EqWCrFiOqn9EVvcoo7gZzONCWVwQ==", "dev": true, "requires": { "prettier-linter-helpers": "^1.0.0" } }, "eslint-plugin-react": { - "version": "7.24.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.24.0.tgz", - "integrity": "sha512-KJJIx2SYx7PBx3ONe/mEeMz4YE0Lcr7feJTCMyyKb/341NcjuAgim3Acgan89GfPv7nxXK2+0slu0CWXYM4x+Q==", + "version": "7.25.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.25.1.tgz", + "integrity": "sha512-P4j9K1dHoFXxDNP05AtixcJEvIT6ht8FhYKsrkY0MPCPaUMYijhpWwNiRDZVtA8KFuZOkGSeft6QwH8KuVpJug==", "dev": true, "requires": { "array-includes": "^3.1.3", "array.prototype.flatmap": "^1.2.4", "doctrine": "^2.1.0", + "estraverse": "^5.2.0", "has": "^1.0.3", "jsx-ast-utils": "^2.4.1 || ^3.0.0", "minimatch": "^3.0.4", @@ -5972,6 +5952,12 @@ "esutils": "^2.0.2" } }, + "estraverse": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", + "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==", + "dev": true + }, "resolve": { "version": "2.0.0-next.3", "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.3.tgz", @@ -5985,9 +5971,9 @@ } }, "eslint-plugin-react-hooks": { - "version": "2.5.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-2.5.1.tgz", - "integrity": "sha512-Y2c4b55R+6ZzwtTppKwSmK/Kar8AdLiC2f9NADCuxbcTgPPg41Gyqa6b9GppgXSvCtkRw43ZE86CT5sejKC6/g==", + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-4.2.0.tgz", + "integrity": "sha512-623WEiZJqxR7VdxFCKLI6d6LLpwJkGPYKODnkH3D7WpOG5KM8yWueBd8TLsNAetEJNF5iJmolaAKO3F8yzyVBQ==", "dev": true }, "eslint-scope": { @@ -6001,29 +5987,29 @@ } }, "eslint-utils": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", - "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz", + "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==", "dev": true, "requires": { - "eslint-visitor-keys": "^1.1.0" + "eslint-visitor-keys": "^2.0.0" } }, "eslint-visitor-keys": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", - "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", + "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", "dev": true }, "espree": { - "version": "6.2.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-6.2.1.tgz", - "integrity": "sha512-ysCxRQY3WaXJz9tdbWOwuWr5Y/XrPTGX9Kiz3yoUXwW0VZ4w30HTkQLaGx/+ttFjF8i+ACbArnB4ce68a9m5hw==", + "version": "7.3.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.1.tgz", + "integrity": "sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==", "dev": true, "requires": { - "acorn": "^7.1.1", - "acorn-jsx": "^5.2.0", - "eslint-visitor-keys": "^1.1.0" + "acorn": "^7.4.0", + "acorn-jsx": "^5.3.1", + "eslint-visitor-keys": "^1.3.0" }, "dependencies": { "acorn": { @@ -6031,6 +6017,12 @@ "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", "dev": true + }, + "eslint-visitor-keys": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz", + "integrity": "sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==", + "dev": true } } }, @@ -6165,12 +6157,6 @@ } } }, - "exec-sh": { - "version": "0.3.6", - "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.6.tgz", - "integrity": "sha512-nQn+hI3yp+oD0huYhKwvYI32+JFeq+XkNcD1GAo3Y/MjxsfVGmrrzrnzjWiNY6f+pUCP440fThsFh5gZrRAU/w==", - "dev": true - }, "execa": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz", @@ -6278,25 +6264,27 @@ } }, "expect": { - "version": "25.5.0", - "resolved": "https://registry.npmjs.org/expect/-/expect-25.5.0.tgz", - "integrity": "sha512-w7KAXo0+6qqZZhovCaBVPSIqQp7/UTcx4M9uKt2m6pd2VB1voyC8JizLRqeEqud3AAVP02g+hbErDu5gu64tlA==", + "version": "27.2.0", + "resolved": "https://registry.npmjs.org/expect/-/expect-27.2.0.tgz", + "integrity": "sha512-oOTbawMQv7AK1FZURbPTgGSzmhxkjFzoARSvDjOMnOpeWuYQx1tP6rXu9MIX5mrACmyCAM7fSNP8IJO2f1p0CQ==", "dev": true, "requires": { - "@jest/types": "^25.5.0", - "ansi-styles": "^4.0.0", - "jest-get-type": "^25.2.6", - "jest-matcher-utils": "^25.5.0", - "jest-message-util": "^25.5.0", - "jest-regex-util": "^25.2.6" + "@jest/types": "^27.1.1", + "ansi-styles": "^5.0.0", + "jest-get-type": "^27.0.6", + "jest-matcher-utils": "^27.2.0", + "jest-message-util": "^27.2.0", + "jest-regex-util": "^27.0.6" + }, + "dependencies": { + "ansi-styles": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", + "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", + "dev": true + } } }, - "extend": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", - "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==", - "dev": true - }, "extend-shallow": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", @@ -6318,17 +6306,6 @@ } } }, - "external-editor": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/external-editor/-/external-editor-3.1.0.tgz", - "integrity": "sha512-hMQ4CX1p1izmuLYyZqLMO/qGNw10wSv9QDCPfzXfyFrOaCSSoRfqE1Kf1s5an66J5JZC62NewG+mK49jOCtQew==", - "dev": true, - "requires": { - "chardet": "^0.7.0", - "iconv-lite": "^0.4.24", - "tmp": "^0.0.33" - } - }, "extglob": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", @@ -6394,12 +6371,6 @@ } } }, - "extsprintf": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", - "integrity": "sha1-lpGEQOMEGnpBT4xS48V06zw+HgU=", - "dev": true - }, "fast-csv": { "version": "4.3.6", "resolved": "https://registry.npmjs.org/fast-csv/-/fast-csv-4.3.6.tgz", @@ -6515,6 +6486,12 @@ "integrity": "sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==", "dev": true }, + "figlet": { + "version": "1.5.2", + "resolved": "https://registry.npmjs.org/figlet/-/figlet-1.5.2.tgz", + "integrity": "sha512-WOn21V8AhyE1QqVfPIVxe3tupJacq1xGkPTB4iagT6o+P2cAgEOOwIxMftr4+ZCTI6d551ij9j61DFr0nsP2uQ==", + "dev": true + }, "figures": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/figures/-/figures-3.2.0.tgz", @@ -6533,12 +6510,12 @@ } }, "file-entry-cache": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-5.0.1.tgz", - "integrity": "sha512-bCg29ictuBaKUwwArK4ouCaqDgLZcysCFLmM/Yn/FDoqndh/9vNuQfXRDvTuXKLxfD/JtZQGKFT8MGcJBK644g==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", + "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", "dev": true, "requires": { - "flat-cache": "^2.0.1" + "flat-cache": "^3.0.4" } }, "file-loader": { @@ -6604,20 +6581,19 @@ } }, "flat-cache": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz", - "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==", + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.0.4.tgz", + "integrity": "sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==", "dev": true, "requires": { - "flatted": "^2.0.0", - "rimraf": "2.6.3", - "write": "1.0.3" + "flatted": "^3.1.0", + "rimraf": "^3.0.2" }, "dependencies": { "rimraf": { - "version": "2.6.3", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", - "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", "dev": true, "requires": { "glob": "^7.1.3" @@ -6626,9 +6602,9 @@ } }, "flatted": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.2.tgz", - "integrity": "sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==", + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.2.tgz", + "integrity": "sha512-JaTY/wtrcSyvXJl4IMFHPKyFur1sE9AUqc0QnhOaJ0CxHtAoIV8pYDzeEfAaNEtGkOfq4gr3LBFmdXW5mOQFnA==", "dev": true }, "flush-write-stream": { @@ -6647,20 +6623,14 @@ "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=", "dev": true }, - "forever-agent": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", - "integrity": "sha1-+8cfDEGt6zf5bFd60e1C2P2sypE=", - "dev": true - }, "form-data": { - "version": "2.3.3", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.3.tgz", - "integrity": "sha512-1lLKB2Mu3aGP1Q/2eCOx0fNbRMe7XdwktwOruhfqqd0rIJWwN4Dh+E3hrPSlDCXnSR7UtZ1N38rVXm+6+MEhJQ==", + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.1.tgz", + "integrity": "sha512-RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg==", "dev": true, "requires": { "asynckit": "^0.4.0", - "combined-stream": "^1.0.6", + "combined-stream": "^1.0.8", "mime-types": "^2.1.12" } }, @@ -6797,12 +6767,6 @@ "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==", "dev": true }, - "get-stdin": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-6.0.0.tgz", - "integrity": "sha512-jp4tHawyV7+fkkSKyvjuLZswblUtz+SQKzSWnBbii16BuZksJlU1wuBYXY75r+duh/llF1ur6oNwi+2ZzjKZ7g==", - "dev": true - }, "get-stream": { "version": "5.2.0", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", @@ -6812,21 +6776,22 @@ "pump": "^3.0.0" } }, + "get-symbol-description": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.0.0.tgz", + "integrity": "sha512-2EmdH1YvIQiZpltCNgkuiUnyukzxM/R6NDJX31Ke3BG1Nq5b0S2PhX59UKi9vZpPDQVdqn+1IcaAwnzTT5vCjw==", + "dev": true, + "requires": { + "call-bind": "^1.0.2", + "get-intrinsic": "^1.1.1" + } + }, "get-value": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz", "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=", "dev": true }, - "getpass": { - "version": "0.1.7", - "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", - "integrity": "sha1-Xv+OPmhNVprkyysSgmBOi6YhSfo=", - "dev": true, - "requires": { - "assert-plus": "^1.0.0" - } - }, "git-log-parser": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/git-log-parser/-/git-log-parser-1.2.0.tgz", @@ -6917,13 +6882,6 @@ "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz", "integrity": "sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg==" }, - "growly": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz", - "integrity": "sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=", - "dev": true, - "optional": true - }, "gzip-size": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/gzip-size/-/gzip-size-6.0.0.tgz", @@ -6946,22 +6904,6 @@ "wordwrap": "^1.0.0" } }, - "har-schema": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", - "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=", - "dev": true - }, - "har-validator": { - "version": "5.1.5", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.1.5.tgz", - "integrity": "sha512-nmT2T0lljbxdQZfspsno9hgrG3Uir6Ks5afism62poxqBM6sDnMEuPmzTq8XN0OEwqKLLdh1jQI3qyE66Nzb3w==", - "dev": true, - "requires": { - "ajv": "^6.12.3", - "har-schema": "^2.0.0" - } - }, "hard-rejection": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/hard-rejection/-/hard-rejection-2.1.0.tgz", @@ -7118,12 +7060,12 @@ "dev": true }, "html-encoding-sniffer": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz", - "integrity": "sha512-71lZziiDnsuabfdYiUeWdCVyKuqwWi23L8YeIgV9jSSZHCtb6wB1BKWooH7L3tn4/FuZJMVWyNaIDr4RGmaSYw==", + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz", + "integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==", "dev": true, "requires": { - "whatwg-encoding": "^1.0.1" + "whatwg-encoding": "^1.0.5" } }, "html-escaper": { @@ -7160,17 +7102,6 @@ } } }, - "http-signature": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", - "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", - "dev": true, - "requires": { - "assert-plus": "^1.0.0", - "jsprim": "^1.2.2", - "sshpk": "^1.7.0" - } - }, "https-browserify": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz", @@ -7379,38 +7310,6 @@ "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", "dev": true }, - "inquirer": { - "version": "7.3.3", - "resolved": "https://registry.npmjs.org/inquirer/-/inquirer-7.3.3.tgz", - "integrity": "sha512-JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA==", - "dev": true, - "requires": { - "ansi-escapes": "^4.2.1", - "chalk": "^4.1.0", - "cli-cursor": "^3.1.0", - "cli-width": "^3.0.0", - "external-editor": "^3.0.3", - "figures": "^3.0.0", - "lodash": "^4.17.19", - "mute-stream": "0.0.8", - "run-async": "^2.4.0", - "rxjs": "^6.6.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0", - "through": "^2.3.6" - }, - "dependencies": { - "strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", - "dev": true, - "requires": { - "ansi-regex": "^5.0.0" - } - } - } - }, "internal-slot": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.0.3.tgz", @@ -7438,12 +7337,6 @@ "p-is-promise": "^3.0.0" } }, - "ip-regex": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz", - "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=", - "dev": true - }, "is-absolute-url": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-3.0.3.tgz", @@ -7517,12 +7410,12 @@ "dev": true }, "is-ci": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz", - "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-3.0.0.tgz", + "integrity": "sha512-kDXyttuLeslKAHYL/K28F2YkM3x5jvFPEw3yXbRptXydjD9rpLEz+C5K5iutY9ZiUu6AP41JdvRQwF4Iqs4ZCQ==", "dev": true, "requires": { - "ci-info": "^2.0.0" + "ci-info": "^3.1.1" } }, "is-color-stop": { @@ -7604,13 +7497,6 @@ } } }, - "is-docker": { - "version": "2.2.1", - "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz", - "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==", - "dev": true, - "optional": true - }, "is-extendable": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", @@ -7723,6 +7609,12 @@ "isobject": "^3.0.1" } }, + "is-potential-custom-element-name": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz", + "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ==", + "dev": true + }, "is-reference": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/is-reference/-/is-reference-1.2.1.tgz", @@ -7787,6 +7679,12 @@ "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=", "dev": true }, + "is-unicode-supported": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", + "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", + "dev": true + }, "is-windows": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", @@ -7816,12 +7714,6 @@ "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=", "dev": true }, - "isstream": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", - "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=", - "dev": true - }, "issue-parser": { "version": "6.0.0", "resolved": "https://registry.npmjs.org/issue-parser/-/issue-parser-6.0.0.tgz", @@ -7934,237 +7826,155 @@ "dev": true }, "jest": { - "version": "25.5.4", - "resolved": "https://registry.npmjs.org/jest/-/jest-25.5.4.tgz", - "integrity": "sha512-hHFJROBTqZahnO+X+PMtT6G2/ztqAZJveGqz//FnWWHurizkD05PQGzRZOhF3XP6z7SJmL+5tCfW8qV06JypwQ==", + "version": "27.2.0", + "resolved": "https://registry.npmjs.org/jest/-/jest-27.2.0.tgz", + "integrity": "sha512-oUqVXyvh5YwEWl263KWdPUAqEzBFzGHdFLQ05hUnITr1tH+9SscEI9A/GH9eBClA+Nw1ct+KNuuOV6wlnmBPcg==", "dev": true, "requires": { - "@jest/core": "^25.5.4", + "@jest/core": "^27.2.0", "import-local": "^3.0.2", - "jest-cli": "^25.5.4" + "jest-cli": "^27.2.0" }, "dependencies": { - "chalk": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", - "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "jest-cli": { + "version": "27.2.0", + "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-27.2.0.tgz", + "integrity": "sha512-bq1X/B/b1kT9y1zIFMEW3GFRX1HEhFybiqKdbxM+j11XMMYSbU9WezfyWIhrSOmPT+iODLATVjfsCnbQs7cfIA==", "dev": true, "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" - } - }, - "cliui": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", - "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==", - "dev": true, - "requires": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.0", - "wrap-ansi": "^6.2.0" - } - }, - "find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "dev": true, - "requires": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - } - }, - "jest-cli": { - "version": "25.5.4", - "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-25.5.4.tgz", - "integrity": "sha512-rG8uJkIiOUpnREh1768/N3n27Cm+xPFkSNFO91tgg+8o2rXeVLStz+vkXkGr4UtzH6t1SNbjwoiswd7p4AhHTw==", - "dev": true, - "requires": { - "@jest/core": "^25.5.4", - "@jest/test-result": "^25.5.0", - "@jest/types": "^25.5.0", - "chalk": "^3.0.0", + "@jest/core": "^27.2.0", + "@jest/test-result": "^27.2.0", + "@jest/types": "^27.1.1", + "chalk": "^4.0.0", "exit": "^0.1.2", "graceful-fs": "^4.2.4", "import-local": "^3.0.2", - "is-ci": "^2.0.0", - "jest-config": "^25.5.4", - "jest-util": "^25.5.0", - "jest-validate": "^25.5.0", + "jest-config": "^27.2.0", + "jest-util": "^27.2.0", + "jest-validate": "^27.2.0", "prompts": "^2.0.1", - "realpath-native": "^2.0.0", - "yargs": "^15.3.1" - } - }, - "locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "dev": true, - "requires": { - "p-locate": "^4.1.0" + "yargs": "^16.0.3" } }, - "p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "dev": true, - "requires": { - "p-limit": "^2.2.0" - } - }, - "path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "y18n": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", "dev": true }, - "strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", - "dev": true, - "requires": { - "ansi-regex": "^5.0.0" - } - }, - "wrap-ansi": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", - "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", - "dev": true, - "requires": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - } - }, "yargs": { - "version": "15.4.1", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz", - "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==", + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", + "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", "dev": true, "requires": { - "cliui": "^6.0.0", - "decamelize": "^1.2.0", - "find-up": "^4.1.0", - "get-caller-file": "^2.0.1", + "cliui": "^7.0.2", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", - "set-blocking": "^2.0.0", "string-width": "^4.2.0", - "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^18.1.2" + "y18n": "^5.0.5", + "yargs-parser": "^20.2.2" } } } }, "jest-changed-files": { - "version": "25.5.0", - "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-25.5.0.tgz", - "integrity": "sha512-EOw9QEqapsDT7mKF162m8HFzRPbmP8qJQny6ldVOdOVBz3ACgPm/1nAn5fPQ/NDaYhX/AHkrGwwkCncpAVSXcw==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-27.1.1.tgz", + "integrity": "sha512-5TV9+fYlC2A6hu3qtoyGHprBwCAn0AuGA77bZdUgYvVlRMjHXo063VcWTEAyx6XAZ85DYHqp0+aHKbPlfRDRvA==", "dev": true, "requires": { - "@jest/types": "^25.5.0", - "execa": "^3.2.0", - "throat": "^5.0.0" + "@jest/types": "^27.1.1", + "execa": "^5.0.0", + "throat": "^6.0.1" }, "dependencies": { - "cross-spawn": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", - "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", - "dev": true, - "requires": { - "path-key": "^3.1.0", - "shebang-command": "^2.0.0", - "which": "^2.0.1" - } - }, "execa": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-3.4.0.tgz", - "integrity": "sha512-r9vdGQk4bmCuK1yKQu1KTwcT2zwfWdbdaXfCtAh+5nU/4fSX+JAb7vZGvI5naJrQlvONrEB20jeruESI69530g==", + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", + "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", "dev": true, "requires": { - "cross-spawn": "^7.0.0", - "get-stream": "^5.0.0", - "human-signals": "^1.1.1", + "cross-spawn": "^7.0.3", + "get-stream": "^6.0.0", + "human-signals": "^2.1.0", "is-stream": "^2.0.0", "merge-stream": "^2.0.0", - "npm-run-path": "^4.0.0", - "onetime": "^5.1.0", - "p-finally": "^2.0.0", - "signal-exit": "^3.0.2", + "npm-run-path": "^4.0.1", + "onetime": "^5.1.2", + "signal-exit": "^3.0.3", "strip-final-newline": "^2.0.0" } }, - "p-finally": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-2.0.1.tgz", - "integrity": "sha512-vpm09aKwq6H9phqRQzecoDpD8TmVyGw70qmWlyq5onxY7tqyTTFVvxMykxQSQKILBSFlbXpypIw2T1Ml7+DDtw==", - "dev": true - }, - "path-key": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "get-stream": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", + "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", "dev": true }, - "shebang-command": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", - "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", - "dev": true, - "requires": { - "shebang-regex": "^3.0.0" - } - }, - "shebang-regex": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "human-signals": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", + "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", "dev": true - }, - "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-circus": { + "version": "27.2.0", + "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-27.2.0.tgz", + "integrity": "sha512-WwENhaZwOARB1nmcboYPSv/PwHBUGRpA4MEgszjr9DLCl97MYw0qZprBwLb7rNzvMwfIvNGG7pefQ5rxyBlzIA==", + "dev": true, + "requires": { + "@jest/environment": "^27.2.0", + "@jest/test-result": "^27.2.0", + "@jest/types": "^27.1.1", + "@types/node": "*", + "chalk": "^4.0.0", + "co": "^4.6.0", + "dedent": "^0.7.0", + "expect": "^27.2.0", + "is-generator-fn": "^2.0.0", + "jest-each": "^27.2.0", + "jest-matcher-utils": "^27.2.0", + "jest-message-util": "^27.2.0", + "jest-runtime": "^27.2.0", + "jest-snapshot": "^27.2.0", + "jest-util": "^27.2.0", + "pretty-format": "^27.2.0", + "slash": "^3.0.0", + "stack-utils": "^2.0.3", + "throat": "^6.0.1" + } + }, "jest-config": { - "version": "25.5.4", - "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-25.5.4.tgz", - "integrity": "sha512-SZwR91SwcdK6bz7Gco8qL7YY2sx8tFJYzvg216DLihTWf+LKY/DoJXpM9nTzYakSyfblbqeU48p/p7Jzy05Atg==", + "version": "27.2.0", + "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-27.2.0.tgz", + "integrity": "sha512-Z1romHpxeNwLxQtouQ4xt07bY6HSFGKTo0xJcvOK3u6uJHveA4LB2P+ty9ArBLpTh3AqqPxsyw9l9GMnWBYS9A==", "dev": true, "requires": { "@babel/core": "^7.1.0", - "@jest/test-sequencer": "^25.5.4", - "@jest/types": "^25.5.0", - "babel-jest": "^25.5.1", - "chalk": "^3.0.0", + "@jest/test-sequencer": "^27.2.0", + "@jest/types": "^27.1.1", + "babel-jest": "^27.2.0", + "chalk": "^4.0.0", "deepmerge": "^4.2.2", "glob": "^7.1.1", "graceful-fs": "^4.2.4", - "jest-environment-jsdom": "^25.5.0", - "jest-environment-node": "^25.5.0", - "jest-get-type": "^25.2.6", - "jest-jasmine2": "^25.5.4", - "jest-regex-util": "^25.2.6", - "jest-resolve": "^25.5.1", - "jest-util": "^25.5.0", - "jest-validate": "^25.5.0", - "micromatch": "^4.0.2", - "pretty-format": "^25.5.0", - "realpath-native": "^2.0.0" + "is-ci": "^3.0.0", + "jest-circus": "^27.2.0", + "jest-environment-jsdom": "^27.2.0", + "jest-environment-node": "^27.2.0", + "jest-get-type": "^27.0.6", + "jest-jasmine2": "^27.2.0", + "jest-regex-util": "^27.0.6", + "jest-resolve": "^27.2.0", + "jest-runner": "^27.2.0", + "jest-util": "^27.2.0", + "jest-validate": "^27.2.0", + "micromatch": "^4.0.4", + "pretty-format": "^27.2.0" }, "dependencies": { "braces": { @@ -8176,16 +7986,6 @@ "fill-range": "^7.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" - } - }, "fill-range": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", @@ -8223,124 +8023,93 @@ } }, "jest-diff": { - "version": "25.5.0", - "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-25.5.0.tgz", - "integrity": "sha512-z1kygetuPiREYdNIumRpAHY6RXiGmp70YHptjdaxTWGmA085W3iCnXNx0DhflK3vwrKmrRWyY1wUpkPMVxMK7A==", + "version": "27.2.0", + "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-27.2.0.tgz", + "integrity": "sha512-QSO9WC6btFYWtRJ3Hac0sRrkspf7B01mGrrQEiCW6TobtViJ9RWL0EmOs/WnBsZDsI/Y2IoSHZA2x6offu0sYw==", "dev": true, "requires": { - "chalk": "^3.0.0", - "diff-sequences": "^25.2.6", - "jest-get-type": "^25.2.6", - "pretty-format": "^25.5.0" - }, - "dependencies": { - "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" - } - } + "chalk": "^4.0.0", + "diff-sequences": "^27.0.6", + "jest-get-type": "^27.0.6", + "pretty-format": "^27.2.0" } }, "jest-docblock": { - "version": "25.3.0", - "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-25.3.0.tgz", - "integrity": "sha512-aktF0kCar8+zxRHxQZwxMy70stc9R1mOmrLsT5VO3pIT0uzGRSDAXxSlz4NqQWpuLjPpuMhPRl7H+5FRsvIQAg==", + "version": "27.0.6", + "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-27.0.6.tgz", + "integrity": "sha512-Fid6dPcjwepTFraz0YxIMCi7dejjJ/KL9FBjPYhBp4Sv1Y9PdhImlKZqYU555BlN4TQKaTc+F2Av1z+anVyGkA==", "dev": true, "requires": { "detect-newline": "^3.0.0" } }, "jest-each": { - "version": "25.5.0", - "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-25.5.0.tgz", - "integrity": "sha512-QBogUxna3D8vtiItvn54xXde7+vuzqRrEeaw8r1s+1TG9eZLVJE5ZkKoSUlqFwRjnlaA4hyKGiu9OlkFIuKnjA==", + "version": "27.2.0", + "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-27.2.0.tgz", + "integrity": "sha512-biDmmUQjg+HZOB7MfY2RHSFL3j418nMoC3TK3pGAj880fQQSxvQe1y2Wy23JJJNUlk6YXiGU0yWy86Le1HBPmA==", "dev": true, "requires": { - "@jest/types": "^25.5.0", - "chalk": "^3.0.0", - "jest-get-type": "^25.2.6", - "jest-util": "^25.5.0", - "pretty-format": "^25.5.0" - }, - "dependencies": { - "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" - } - } + "@jest/types": "^27.1.1", + "chalk": "^4.0.0", + "jest-get-type": "^27.0.6", + "jest-util": "^27.2.0", + "pretty-format": "^27.2.0" } }, "jest-environment-jsdom": { - "version": "25.5.0", - "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-25.5.0.tgz", - "integrity": "sha512-7Jr02ydaq4jaWMZLY+Skn8wL5nVIYpWvmeatOHL3tOcV3Zw8sjnPpx+ZdeBfc457p8jCR9J6YCc+Lga0oIy62A==", + "version": "27.2.0", + "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-27.2.0.tgz", + "integrity": "sha512-wNQJi6Rd/AkUWqTc4gWhuTIFPo7tlMK0RPZXeM6AqRHZA3D3vwvTa9ktAktyVyWYmUoXdYstOfyYMG3w4jt7eA==", "dev": true, "requires": { - "@jest/environment": "^25.5.0", - "@jest/fake-timers": "^25.5.0", - "@jest/types": "^25.5.0", - "jest-mock": "^25.5.0", - "jest-util": "^25.5.0", - "jsdom": "^15.2.1" + "@jest/environment": "^27.2.0", + "@jest/fake-timers": "^27.2.0", + "@jest/types": "^27.1.1", + "@types/node": "*", + "jest-mock": "^27.1.1", + "jest-util": "^27.2.0", + "jsdom": "^16.6.0" } }, "jest-environment-node": { - "version": "25.5.0", - "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-25.5.0.tgz", - "integrity": "sha512-iuxK6rQR2En9EID+2k+IBs5fCFd919gVVK5BeND82fYeLWPqvRcFNPKu9+gxTwfB5XwBGBvZ0HFQa+cHtIoslA==", + "version": "27.2.0", + "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.2.0.tgz", + "integrity": "sha512-WbW+vdM4u88iy6Q3ftUEQOSgMPtSgjm3qixYYK2AKEuqmFO2zmACTw1vFUB0qI/QN88X6hA6ZkVKIdIWWzz+yg==", "dev": true, "requires": { - "@jest/environment": "^25.5.0", - "@jest/fake-timers": "^25.5.0", - "@jest/types": "^25.5.0", - "jest-mock": "^25.5.0", - "jest-util": "^25.5.0", - "semver": "^6.3.0" - }, - "dependencies": { - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true - } + "@jest/environment": "^27.2.0", + "@jest/fake-timers": "^27.2.0", + "@jest/types": "^27.1.1", + "@types/node": "*", + "jest-mock": "^27.1.1", + "jest-util": "^27.2.0" } }, "jest-get-type": { - "version": "25.2.6", - "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-25.2.6.tgz", - "integrity": "sha512-DxjtyzOHjObRM+sM1knti6or+eOgcGU4xVSb2HNP1TqO4ahsT+rqZg+nyqHWJSvWgKC5cG3QjGFBqxLghiF/Ig==", + "version": "27.0.6", + "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.0.6.tgz", + "integrity": "sha512-XTkK5exIeUbbveehcSR8w0bhH+c0yloW/Wpl+9vZrjzztCPWrxhHwkIFpZzCt71oRBsgxmuUfxEqOYoZI2macg==", "dev": true }, "jest-haste-map": { - "version": "25.5.1", - "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-25.5.1.tgz", - "integrity": "sha512-dddgh9UZjV7SCDQUrQ+5t9yy8iEgKc1AKqZR9YDww8xsVOtzPQSMVLDChc21+g29oTRexb9/B0bIlZL+sWmvAQ==", + "version": "27.2.0", + "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.2.0.tgz", + "integrity": "sha512-laFet7QkNlWjwZtMGHCucLvF8o9PAh2cgePRck1+uadSM4E4XH9J4gnx4do+a6do8ZV5XHNEAXEkIoNg5XUH2Q==", "dev": true, "requires": { - "@jest/types": "^25.5.0", + "@jest/types": "^27.1.1", "@types/graceful-fs": "^4.1.2", + "@types/node": "*", "anymatch": "^3.0.3", "fb-watchman": "^2.0.0", - "fsevents": "^2.1.2", + "fsevents": "^2.3.2", "graceful-fs": "^4.2.4", - "jest-serializer": "^25.5.0", - "jest-util": "^25.5.0", - "jest-worker": "^25.5.0", - "micromatch": "^4.0.2", - "sane": "^4.0.3", - "walker": "^1.0.7", - "which": "^2.0.2" + "jest-regex-util": "^27.0.6", + "jest-serializer": "^27.0.6", + "jest-util": "^27.2.0", + "jest-worker": "^27.2.0", + "micromatch": "^4.0.4", + "walker": "^1.0.7" }, "dependencies": { "braces": { @@ -8385,103 +8154,72 @@ "requires": { "is-number": "^7.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.5.4", - "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-25.5.4.tgz", - "integrity": "sha512-9acbWEfbmS8UpdcfqnDO+uBUgKa/9hcRh983IHdM+pKmJPL77G0sWAAK0V0kr5LK3a8cSBfkFSoncXwQlRZfkQ==", + "version": "27.2.0", + "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-27.2.0.tgz", + "integrity": "sha512-NcPzZBk6IkDW3Z2V8orGueheGJJYfT5P0zI/vTO/Jp+R9KluUdgFrgwfvZ0A34Kw6HKgiWFILZmh3oQ/eS+UxA==", "dev": true, "requires": { "@babel/traverse": "^7.1.0", - "@jest/environment": "^25.5.0", - "@jest/source-map": "^25.5.0", - "@jest/test-result": "^25.5.0", - "@jest/types": "^25.5.0", - "chalk": "^3.0.0", + "@jest/environment": "^27.2.0", + "@jest/source-map": "^27.0.6", + "@jest/test-result": "^27.2.0", + "@jest/types": "^27.1.1", + "@types/node": "*", + "chalk": "^4.0.0", "co": "^4.6.0", - "expect": "^25.5.0", + "expect": "^27.2.0", "is-generator-fn": "^2.0.0", - "jest-each": "^25.5.0", - "jest-matcher-utils": "^25.5.0", - "jest-message-util": "^25.5.0", - "jest-runtime": "^25.5.4", - "jest-snapshot": "^25.5.1", - "jest-util": "^25.5.0", - "pretty-format": "^25.5.0", - "throat": "^5.0.0" - }, - "dependencies": { - "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" - } - } + "jest-each": "^27.2.0", + "jest-matcher-utils": "^27.2.0", + "jest-message-util": "^27.2.0", + "jest-runtime": "^27.2.0", + "jest-snapshot": "^27.2.0", + "jest-util": "^27.2.0", + "pretty-format": "^27.2.0", + "throat": "^6.0.1" } }, "jest-leak-detector": { - "version": "25.5.0", - "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-25.5.0.tgz", - "integrity": "sha512-rV7JdLsanS8OkdDpZtgBf61L5xZ4NnYLBq72r6ldxahJWWczZjXawRsoHyXzibM5ed7C2QRjpp6ypgwGdKyoVA==", + "version": "27.2.0", + "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-27.2.0.tgz", + "integrity": "sha512-e91BIEmbZw5+MHkB4Hnrq7S86coTxUMCkz4n7DLmQYvl9pEKmRx9H/JFH87bBqbIU5B2Ju1soKxRWX6/eGFGpA==", "dev": true, "requires": { - "jest-get-type": "^25.2.6", - "pretty-format": "^25.5.0" + "jest-get-type": "^27.0.6", + "pretty-format": "^27.2.0" } }, "jest-matcher-utils": { - "version": "25.5.0", - "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-25.5.0.tgz", - "integrity": "sha512-VWI269+9JS5cpndnpCwm7dy7JtGQT30UHfrnM3mXl22gHGt/b7NkjBqXfbhZ8V4B7ANUsjK18PlSBmG0YH7gjw==", + "version": "27.2.0", + "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.2.0.tgz", + "integrity": "sha512-F+LG3iTwJ0gPjxBX6HCyrARFXq6jjiqhwBQeskkJQgSLeF1j6ui1RTV08SR7O51XTUhtc8zqpDj8iCG4RGmdKw==", "dev": true, "requires": { - "chalk": "^3.0.0", - "jest-diff": "^25.5.0", - "jest-get-type": "^25.2.6", - "pretty-format": "^25.5.0" - }, - "dependencies": { - "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" - } - } + "chalk": "^4.0.0", + "jest-diff": "^27.2.0", + "jest-get-type": "^27.0.6", + "pretty-format": "^27.2.0" } }, "jest-message-util": { - "version": "25.5.0", - "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-25.5.0.tgz", - "integrity": "sha512-ezddz3YCT/LT0SKAmylVyWWIGYoKHOFOFXx3/nA4m794lfVUskMcwhip6vTgdVrOtYdjeQeis2ypzes9mZb4EA==", + "version": "27.2.0", + "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.2.0.tgz", + "integrity": "sha512-y+sfT/94CiP8rKXgwCOzO1mUazIEdEhrLjuiu+RKmCP+8O/TJTSne9dqQRbFIHBtlR2+q7cddJlWGir8UATu5w==", "dev": true, "requires": { - "@babel/code-frame": "^7.0.0", - "@jest/types": "^25.5.0", - "@types/stack-utils": "^1.0.1", - "chalk": "^3.0.0", + "@babel/code-frame": "^7.12.13", + "@jest/types": "^27.1.1", + "@types/stack-utils": "^2.0.0", + "chalk": "^4.0.0", "graceful-fs": "^4.2.4", - "micromatch": "^4.0.2", + "micromatch": "^4.0.4", + "pretty-format": "^27.2.0", "slash": "^3.0.0", - "stack-utils": "^1.0.1" + "stack-utils": "^2.0.3" }, "dependencies": { "braces": { @@ -8493,16 +8231,6 @@ "fill-range": "^7.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" - } - }, "fill-range": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", @@ -8540,12 +8268,13 @@ } }, "jest-mock": { - "version": "25.5.0", - "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-25.5.0.tgz", - "integrity": "sha512-eXWuTV8mKzp/ovHc5+3USJMYsTBhyQ+5A1Mak35dey/RG8GlM4YWVylZuGgVXinaW6tpvk/RSecmF37FKUlpXA==", + "version": "27.1.1", + "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-27.1.1.tgz", + "integrity": "sha512-SClsFKuYBf+6SSi8jtAYOuPw8DDMsTElUWEae3zq7vDhH01ayVSIHUSIa8UgbDOUalCFp6gNsaikN0rbxN4dbw==", "dev": true, "requires": { - "@jest/types": "^25.5.0" + "@jest/types": "^27.1.1", + "@types/node": "*" } }, "jest-pnp-resolver": { @@ -8555,267 +8284,142 @@ "dev": true }, "jest-regex-util": { - "version": "25.2.6", - "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-25.2.6.tgz", - "integrity": "sha512-KQqf7a0NrtCkYmZZzodPftn7fL1cq3GQAFVMn5Hg8uKx/fIenLEobNanUxb7abQ1sjADHBseG/2FGpsv/wr+Qw==", + "version": "27.0.6", + "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-27.0.6.tgz", + "integrity": "sha512-SUhPzBsGa1IKm8hx2F4NfTGGp+r7BXJ4CulsZ1k2kI+mGLG+lxGrs76veN2LF/aUdGosJBzKgXmNCw+BzFqBDQ==", "dev": true }, "jest-resolve": { - "version": "25.5.1", - "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-25.5.1.tgz", - "integrity": "sha512-Hc09hYch5aWdtejsUZhA+vSzcotf7fajSlPA6EZPE1RmPBAD39XtJhvHWFStid58iit4IPDLI/Da4cwdDmAHiQ==", + "version": "27.2.0", + "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.2.0.tgz", + "integrity": "sha512-v09p9Ib/VtpHM6Cz+i9lEAv1Z/M5NVxsyghRHRMEUOqwPQs3zwTdwp1xS3O/k5LocjKiGS0OTaJoBSpjbM2Jlw==", "dev": true, "requires": { - "@jest/types": "^25.5.0", - "browser-resolve": "^1.11.3", - "chalk": "^3.0.0", + "@jest/types": "^27.1.1", + "chalk": "^4.0.0", + "escalade": "^3.1.1", "graceful-fs": "^4.2.4", - "jest-pnp-resolver": "^1.2.1", - "read-pkg-up": "^7.0.1", - "realpath-native": "^2.0.0", - "resolve": "^1.17.0", + "jest-haste-map": "^27.2.0", + "jest-pnp-resolver": "^1.2.2", + "jest-util": "^27.2.0", + "jest-validate": "^27.2.0", + "resolve": "^1.20.0", "slash": "^3.0.0" - }, - "dependencies": { - "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" - } - }, - "find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "dev": true, - "requires": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - } - }, - "locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "dev": true, - "requires": { - "p-locate": "^4.1.0" - } - }, - "p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", - "dev": true, - "requires": { - "p-limit": "^2.2.0" - } - }, - "path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", - "dev": true - }, - "read-pkg": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz", - "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==", - "dev": true, - "requires": { - "@types/normalize-package-data": "^2.4.0", - "normalize-package-data": "^2.5.0", - "parse-json": "^5.0.0", - "type-fest": "^0.6.0" - }, - "dependencies": { - "type-fest": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.6.0.tgz", - "integrity": "sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg==", - "dev": true - } - } - }, - "read-pkg-up": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-7.0.1.tgz", - "integrity": "sha512-zK0TB7Xd6JpCLmlLmufqykGE+/TlOePD6qKClNW7hHDKFh/J7/7gCWGR7joEQEW1bKq3a3yUZSObOoWLFQ4ohg==", - "dev": true, - "requires": { - "find-up": "^4.1.0", - "read-pkg": "^5.2.0", - "type-fest": "^0.8.1" - } - }, - "type-fest": { - "version": "0.8.1", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", - "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", - "dev": true - } } }, "jest-resolve-dependencies": { - "version": "25.5.4", - "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-25.5.4.tgz", - "integrity": "sha512-yFmbPd+DAQjJQg88HveObcGBA32nqNZ02fjYmtL16t1xw9bAttSn5UGRRhzMHIQbsep7znWvAvnD4kDqOFM0Uw==", + "version": "27.2.0", + "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-27.2.0.tgz", + "integrity": "sha512-EY5jc/Y0oxn+oVEEldTidmmdVoZaknKPyDORA012JUdqPyqPL+lNdRyI3pGti0RCydds6coaw6xt4JQY54dKsg==", "dev": true, "requires": { - "@jest/types": "^25.5.0", - "jest-regex-util": "^25.2.6", - "jest-snapshot": "^25.5.1" + "@jest/types": "^27.1.1", + "jest-regex-util": "^27.0.6", + "jest-snapshot": "^27.2.0" } }, "jest-runner": { - "version": "25.5.4", - "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-25.5.4.tgz", - "integrity": "sha512-V/2R7fKZo6blP8E9BL9vJ8aTU4TH2beuqGNxHbxi6t14XzTb+x90B3FRgdvuHm41GY8ch4xxvf0ATH4hdpjTqg==", + "version": "27.2.0", + "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-27.2.0.tgz", + "integrity": "sha512-Cl+BHpduIc0cIVTjwoyx0pQk4Br8gn+wkr35PmKCmzEdOUnQ2wN7QVXA8vXnMQXSlFkN/+KWnk20TAVBmhgrww==", "dev": true, "requires": { - "@jest/console": "^25.5.0", - "@jest/environment": "^25.5.0", - "@jest/test-result": "^25.5.0", - "@jest/types": "^25.5.0", - "chalk": "^3.0.0", + "@jest/console": "^27.2.0", + "@jest/environment": "^27.2.0", + "@jest/test-result": "^27.2.0", + "@jest/transform": "^27.2.0", + "@jest/types": "^27.1.1", + "@types/node": "*", + "chalk": "^4.0.0", + "emittery": "^0.8.1", "exit": "^0.1.2", "graceful-fs": "^4.2.4", - "jest-config": "^25.5.4", - "jest-docblock": "^25.3.0", - "jest-haste-map": "^25.5.1", - "jest-jasmine2": "^25.5.4", - "jest-leak-detector": "^25.5.0", - "jest-message-util": "^25.5.0", - "jest-resolve": "^25.5.1", - "jest-runtime": "^25.5.4", - "jest-util": "^25.5.0", - "jest-worker": "^25.5.0", + "jest-docblock": "^27.0.6", + "jest-environment-jsdom": "^27.2.0", + "jest-environment-node": "^27.2.0", + "jest-haste-map": "^27.2.0", + "jest-leak-detector": "^27.2.0", + "jest-message-util": "^27.2.0", + "jest-resolve": "^27.2.0", + "jest-runtime": "^27.2.0", + "jest-util": "^27.2.0", + "jest-worker": "^27.2.0", "source-map-support": "^0.5.6", - "throat": "^5.0.0" - }, - "dependencies": { - "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" - } - } + "throat": "^6.0.1" } }, "jest-runtime": { - "version": "25.5.4", - "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-25.5.4.tgz", - "integrity": "sha512-RWTt8LeWh3GvjYtASH2eezkc8AehVoWKK20udV6n3/gC87wlTbE1kIA+opCvNWyyPeBs6ptYsc6nyHUb1GlUVQ==", - "dev": true, - "requires": { - "@jest/console": "^25.5.0", - "@jest/environment": "^25.5.0", - "@jest/globals": "^25.5.2", - "@jest/source-map": "^25.5.0", - "@jest/test-result": "^25.5.0", - "@jest/transform": "^25.5.1", - "@jest/types": "^25.5.0", - "@types/yargs": "^15.0.0", - "chalk": "^3.0.0", + "version": "27.2.0", + "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.2.0.tgz", + "integrity": "sha512-6gRE9AVVX49hgBbWQ9PcNDeM4upMUXzTpBs0kmbrjyotyUyIJixLPsYjpeTFwAA07PVLDei1iAm2chmWycdGdQ==", + "dev": true, + "requires": { + "@jest/console": "^27.2.0", + "@jest/environment": "^27.2.0", + "@jest/fake-timers": "^27.2.0", + "@jest/globals": "^27.2.0", + "@jest/source-map": "^27.0.6", + "@jest/test-result": "^27.2.0", + "@jest/transform": "^27.2.0", + "@jest/types": "^27.1.1", + "@types/yargs": "^16.0.0", + "chalk": "^4.0.0", + "cjs-module-lexer": "^1.0.0", "collect-v8-coverage": "^1.0.0", + "execa": "^5.0.0", "exit": "^0.1.2", "glob": "^7.1.3", "graceful-fs": "^4.2.4", - "jest-config": "^25.5.4", - "jest-haste-map": "^25.5.1", - "jest-message-util": "^25.5.0", - "jest-mock": "^25.5.0", - "jest-regex-util": "^25.2.6", - "jest-resolve": "^25.5.1", - "jest-snapshot": "^25.5.1", - "jest-util": "^25.5.0", - "jest-validate": "^25.5.0", - "realpath-native": "^2.0.0", + "jest-haste-map": "^27.2.0", + "jest-message-util": "^27.2.0", + "jest-mock": "^27.1.1", + "jest-regex-util": "^27.0.6", + "jest-resolve": "^27.2.0", + "jest-snapshot": "^27.2.0", + "jest-util": "^27.2.0", + "jest-validate": "^27.2.0", "slash": "^3.0.0", "strip-bom": "^4.0.0", - "yargs": "^15.3.1" + "yargs": "^16.0.3" }, "dependencies": { "@types/yargs": { - "version": "15.0.14", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.14.tgz", - "integrity": "sha512-yEJzHoxf6SyQGhBhIYGXQDSCkJjB6HohDShto7m8vaKg9Yp0Yn8+71J9eakh2bnPg6BfsH9PRMhiRTZnd4eXGQ==", + "version": "16.0.4", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-16.0.4.tgz", + "integrity": "sha512-T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw==", "dev": true, "requires": { "@types/yargs-parser": "*" } }, - "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" - } - }, - "cliui": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", - "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==", - "dev": true, - "requires": { - "string-width": "^4.2.0", - "strip-ansi": "^6.0.0", - "wrap-ansi": "^6.2.0" - } - }, - "find-up": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", - "dev": true, - "requires": { - "locate-path": "^5.0.0", - "path-exists": "^4.0.0" - } - }, - "locate-path": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", - "dev": true, - "requires": { - "p-locate": "^4.1.0" - } - }, - "p-locate": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "execa": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz", + "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==", "dev": true, "requires": { - "p-limit": "^2.2.0" + "cross-spawn": "^7.0.3", + "get-stream": "^6.0.0", + "human-signals": "^2.1.0", + "is-stream": "^2.0.0", + "merge-stream": "^2.0.0", + "npm-run-path": "^4.0.1", + "onetime": "^5.1.2", + "signal-exit": "^3.0.3", + "strip-final-newline": "^2.0.0" } }, - "path-exists": { - "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "get-stream": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz", + "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==", "dev": true }, - "strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", - "dev": true, - "requires": { - "ansi-regex": "^5.0.0" - } + "human-signals": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz", + "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==", + "dev": true }, "strip-bom": { "version": "4.0.0", @@ -8823,110 +8427,197 @@ "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==", "dev": true }, - "wrap-ansi": { - "version": "6.2.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", - "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", - "dev": true, - "requires": { - "ansi-styles": "^4.0.0", - "string-width": "^4.1.0", - "strip-ansi": "^6.0.0" - } + "y18n": { + "version": "5.0.8", + "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", + "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", + "dev": true }, "yargs": { - "version": "15.4.1", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz", - "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==", + "version": "16.2.0", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", + "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", "dev": true, "requires": { - "cliui": "^6.0.0", - "decamelize": "^1.2.0", - "find-up": "^4.1.0", - "get-caller-file": "^2.0.1", + "cliui": "^7.0.2", + "escalade": "^3.1.1", + "get-caller-file": "^2.0.5", "require-directory": "^2.1.1", - "require-main-filename": "^2.0.0", - "set-blocking": "^2.0.0", "string-width": "^4.2.0", - "which-module": "^2.0.0", - "y18n": "^4.0.0", - "yargs-parser": "^18.1.2" + "y18n": "^5.0.5", + "yargs-parser": "^20.2.2" } } } }, "jest-serializer": { - "version": "25.5.0", - "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-25.5.0.tgz", - "integrity": "sha512-LxD8fY1lByomEPflwur9o4e2a5twSQ7TaVNLlFUuToIdoJuBt8tzHfCsZ42Ok6LkKXWzFWf3AGmheuLAA7LcCA==", + "version": "27.0.6", + "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-27.0.6.tgz", + "integrity": "sha512-PtGdVK9EGC7dsaziskfqaAPib6wTViY3G8E5wz9tLVPhHyiDNTZn/xjZ4khAw+09QkoOVpn7vF5nPSN6dtBexA==", "dev": true, "requires": { + "@types/node": "*", "graceful-fs": "^4.2.4" } }, "jest-snapshot": { - "version": "25.5.1", - "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-25.5.1.tgz", - "integrity": "sha512-C02JE1TUe64p2v1auUJ2ze5vcuv32tkv9PyhEb318e8XOKF7MOyXdJ7kdjbvrp3ChPLU2usI7Rjxs97Dj5P0uQ==", + "version": "27.2.0", + "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.2.0.tgz", + "integrity": "sha512-MukJvy3KEqemCT2FoT3Gum37CQqso/62PKTfIzWmZVTsLsuyxQmJd2PI5KPcBYFqLlA8LgZLHM8ZlazkVt8LsQ==", "dev": true, "requires": { + "@babel/core": "^7.7.2", + "@babel/generator": "^7.7.2", + "@babel/parser": "^7.7.2", + "@babel/plugin-syntax-typescript": "^7.7.2", + "@babel/traverse": "^7.7.2", "@babel/types": "^7.0.0", - "@jest/types": "^25.5.0", - "@types/prettier": "^1.19.0", - "chalk": "^3.0.0", - "expect": "^25.5.0", + "@jest/transform": "^27.2.0", + "@jest/types": "^27.1.1", + "@types/babel__traverse": "^7.0.4", + "@types/prettier": "^2.1.5", + "babel-preset-current-node-syntax": "^1.0.0", + "chalk": "^4.0.0", + "expect": "^27.2.0", "graceful-fs": "^4.2.4", - "jest-diff": "^25.5.0", - "jest-get-type": "^25.2.6", - "jest-matcher-utils": "^25.5.0", - "jest-message-util": "^25.5.0", - "jest-resolve": "^25.5.1", - "make-dir": "^3.0.0", + "jest-diff": "^27.2.0", + "jest-get-type": "^27.0.6", + "jest-haste-map": "^27.2.0", + "jest-matcher-utils": "^27.2.0", + "jest-message-util": "^27.2.0", + "jest-resolve": "^27.2.0", + "jest-util": "^27.2.0", "natural-compare": "^1.4.0", - "pretty-format": "^25.5.0", - "semver": "^6.3.0" + "pretty-format": "^27.2.0", + "semver": "^7.3.2" + } + }, + "jest-util": { + "version": "27.2.0", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-27.2.0.tgz", + "integrity": "sha512-T5ZJCNeFpqcLBpx+Hl9r9KoxBCUqeWlJ1Htli+vryigZVJ1vuLB9j35grEBASp4R13KFkV7jM52bBGnArpJN6A==", + "dev": true, + "requires": { + "@jest/types": "^27.1.1", + "@types/node": "*", + "chalk": "^4.0.0", + "graceful-fs": "^4.2.4", + "is-ci": "^3.0.0", + "picomatch": "^2.2.3" + } + }, + "jest-validate": { + "version": "27.2.0", + "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-27.2.0.tgz", + "integrity": "sha512-uIEZGkFKk3+4liA81Xu0maG5aGDyPLdp+4ed244c+Ql0k3aLWQYcMbaMLXOIFcb83LPHzYzqQ8hwNnIxTqfAGQ==", + "dev": true, + "requires": { + "@jest/types": "^27.1.1", + "camelcase": "^6.2.0", + "chalk": "^4.0.0", + "jest-get-type": "^27.0.6", + "leven": "^3.1.0", + "pretty-format": "^27.2.0" + } + }, + "jest-watch-typeahead": { + "version": "0.5.0", + "resolved": "https://registry.npmjs.org/jest-watch-typeahead/-/jest-watch-typeahead-0.5.0.tgz", + "integrity": "sha512-4r36w9vU8+rdg48hj0Z7TvcSqVP6Ao8dk04grlHQNgduyCB0SqrI0xWIl85ZhXrzYvxQ0N5H+rRLAejkQzEHeQ==", + "dev": true, + "requires": { + "ansi-escapes": "^4.2.1", + "chalk": "^3.0.0", + "jest-regex-util": "^25.2.1", + "jest-watcher": "^25.2.4", + "slash": "^3.0.0", + "string-length": "^3.1.0", + "strip-ansi": "^6.0.0" }, "dependencies": { - "chalk": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", - "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "@jest/console": { + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/@jest/console/-/console-25.5.0.tgz", + "integrity": "sha512-T48kZa6MK1Y6k4b89sexwmSF4YLeZS/Udqg3Jj3jG/cHH+N/sLFCEoXEDMOKugJQ9FxPN1osxIknvKkxt6MKyw==", "dev": true, "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" + "@jest/types": "^25.5.0", + "chalk": "^3.0.0", + "jest-message-util": "^25.5.0", + "jest-util": "^25.5.0", + "slash": "^3.0.0" } }, - "make-dir": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", - "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", + "@jest/test-result": { + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-25.5.0.tgz", + "integrity": "sha512-oV+hPJgXN7IQf/fHWkcS99y0smKLU2czLBJ9WA0jHITLst58HpQMtzSYxzaBvYc6U5U6jfoMthqsUlUlbRXs0A==", "dev": true, "requires": { - "semver": "^6.0.0" + "@jest/console": "^25.5.0", + "@jest/types": "^25.5.0", + "@types/istanbul-lib-coverage": "^2.0.0", + "collect-v8-coverage": "^1.0.0" } }, - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", + "@jest/types": { + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-25.5.0.tgz", + "integrity": "sha512-OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw==", + "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" + } + }, + "@types/istanbul-reports": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz", + "integrity": "sha512-P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw==", + "dev": true, + "requires": { + "@types/istanbul-lib-coverage": "*", + "@types/istanbul-lib-report": "*" + } + }, + "@types/stack-utils": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-1.0.1.tgz", + "integrity": "sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw==", "dev": true - } - } - }, - "jest-util": { - "version": "25.5.0", - "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-25.5.0.tgz", - "integrity": "sha512-KVlX+WWg1zUTB9ktvhsg2PXZVdkI1NBevOJSkTKYAyXyH4QSvh+Lay/e/v+bmaFfrkfx43xD8QTfgobzlEXdIA==", - "dev": true, - "requires": { - "@jest/types": "^25.5.0", - "chalk": "^3.0.0", - "graceful-fs": "^4.2.4", - "is-ci": "^2.0.0", - "make-dir": "^3.0.0" - }, - "dependencies": { + }, + "@types/yargs": { + "version": "15.0.14", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.14.tgz", + "integrity": "sha512-yEJzHoxf6SyQGhBhIYGXQDSCkJjB6HohDShto7m8vaKg9Yp0Yn8+71J9eakh2bnPg6BfsH9PRMhiRTZnd4eXGQ==", + "dev": true, + "requires": { + "@types/yargs-parser": "*" + } + }, + "ansi-regex": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", + "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", + "dev": true + }, + "astral-regex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/astral-regex/-/astral-regex-1.0.0.tgz", + "integrity": "sha512-+Ryf6g3BKoRc7jfp7ad8tM4TtMiaWvbF/1/sQcZPkkS7ag3D5nMBCe2UfOTONtAkaG0tO0ij3C5Lwmf1EiyjHg==", + "dev": true + }, + "braces": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", + "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", + "dev": true, + "requires": { + "fill-range": "^7.0.1" + } + }, "chalk": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", @@ -8937,6 +8628,91 @@ "supports-color": "^7.1.0" } }, + "ci-info": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz", + "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==", + "dev": true + }, + "escape-string-regexp": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz", + "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==", + "dev": true + }, + "fill-range": { + "version": "7.0.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", + "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", + "dev": true, + "requires": { + "to-regex-range": "^5.0.1" + } + }, + "is-ci": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz", + "integrity": "sha512-YfJT7rkpQB0updsdHLGWrvhBJfcfzNNawYDNIyQXJz0IViGf75O8EBPKSdvw2rF+LGCsX4FZ8tcr3b19LcZq4w==", + "dev": true, + "requires": { + "ci-info": "^2.0.0" + } + }, + "is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true + }, + "jest-message-util": { + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-25.5.0.tgz", + "integrity": "sha512-ezddz3YCT/LT0SKAmylVyWWIGYoKHOFOFXx3/nA4m794lfVUskMcwhip6vTgdVrOtYdjeQeis2ypzes9mZb4EA==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "@jest/types": "^25.5.0", + "@types/stack-utils": "^1.0.1", + "chalk": "^3.0.0", + "graceful-fs": "^4.2.4", + "micromatch": "^4.0.2", + "slash": "^3.0.0", + "stack-utils": "^1.0.1" + } + }, + "jest-regex-util": { + "version": "25.2.6", + "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-25.2.6.tgz", + "integrity": "sha512-KQqf7a0NrtCkYmZZzodPftn7fL1cq3GQAFVMn5Hg8uKx/fIenLEobNanUxb7abQ1sjADHBseG/2FGpsv/wr+Qw==", + "dev": true + }, + "jest-util": { + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-25.5.0.tgz", + "integrity": "sha512-KVlX+WWg1zUTB9ktvhsg2PXZVdkI1NBevOJSkTKYAyXyH4QSvh+Lay/e/v+bmaFfrkfx43xD8QTfgobzlEXdIA==", + "dev": true, + "requires": { + "@jest/types": "^25.5.0", + "chalk": "^3.0.0", + "graceful-fs": "^4.2.4", + "is-ci": "^2.0.0", + "make-dir": "^3.0.0" + } + }, + "jest-watcher": { + "version": "25.5.0", + "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-25.5.0.tgz", + "integrity": "sha512-XrSfJnVASEl+5+bb51V0Q7WQx65dTSk7NL4yDdVjPnRNpM0hG+ncFmDYJo9O8jaSRcAitVbuVawyXCRoxGrT5Q==", + "dev": true, + "requires": { + "@jest/test-result": "^25.5.0", + "@jest/types": "^25.5.0", + "ansi-escapes": "^4.2.1", + "chalk": "^3.0.0", + "jest-util": "^25.5.0", + "string-length": "^3.1.0" + } + }, "make-dir": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", @@ -8946,116 +8722,98 @@ "semver": "^6.0.0" } }, + "micromatch": { + "version": "4.0.4", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz", + "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==", + "dev": true, + "requires": { + "braces": "^3.0.1", + "picomatch": "^2.2.3" + } + }, "semver": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", "dev": true - } - } - }, - "jest-validate": { - "version": "25.5.0", - "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-25.5.0.tgz", - "integrity": "sha512-okUFKqhZIpo3jDdtUXUZ2LxGUZJIlfdYBvZb1aczzxrlyMlqdnnws9MOxezoLGhSaFc2XYaHNReNQfj5zPIWyQ==", - "dev": true, - "requires": { - "@jest/types": "^25.5.0", - "camelcase": "^5.3.1", - "chalk": "^3.0.0", - "jest-get-type": "^25.2.6", - "leven": "^3.1.0", - "pretty-format": "^25.5.0" - }, - "dependencies": { - "camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", - "dev": true }, - "chalk": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", - "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + "stack-utils": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-1.0.5.tgz", + "integrity": "sha512-KZiTzuV3CnSnSvgMRrARVCj+Ht7rMbauGDK0LdVFRGyenwdylpajAp4Q0i6SX8rEmbTpMMf6ryq2gb8pPq2WgQ==", "dev": true, "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" + "escape-string-regexp": "^2.0.0" } - } - } - }, - "jest-watch-typeahead": { - "version": "0.5.0", - "resolved": "https://registry.npmjs.org/jest-watch-typeahead/-/jest-watch-typeahead-0.5.0.tgz", - "integrity": "sha512-4r36w9vU8+rdg48hj0Z7TvcSqVP6Ao8dk04grlHQNgduyCB0SqrI0xWIl85ZhXrzYvxQ0N5H+rRLAejkQzEHeQ==", - "dev": true, - "requires": { - "ansi-escapes": "^4.2.1", - "chalk": "^3.0.0", - "jest-regex-util": "^25.2.1", - "jest-watcher": "^25.2.4", - "slash": "^3.0.0", - "string-length": "^3.1.0", - "strip-ansi": "^6.0.0" - }, - "dependencies": { - "chalk": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz", - "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==", + }, + "string-length": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/string-length/-/string-length-3.1.0.tgz", + "integrity": "sha512-Ttp5YvkGm5v9Ijagtaz1BnN+k9ObpvS0eIBblPMp2YWL8FBmi9qblQ9fexc2k/CXFgrTIteU3jAw3payCnwSTA==", "dev": true, "requires": { - "ansi-styles": "^4.1.0", - "supports-color": "^7.1.0" + "astral-regex": "^1.0.0", + "strip-ansi": "^5.2.0" + }, + "dependencies": { + "strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dev": true, + "requires": { + "ansi-regex": "^4.1.0" + } + } } }, - "strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", + "to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", "dev": true, "requires": { - "ansi-regex": "^5.0.0" + "is-number": "^7.0.0" } } } }, "jest-watcher": { - "version": "25.5.0", - "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-25.5.0.tgz", - "integrity": "sha512-XrSfJnVASEl+5+bb51V0Q7WQx65dTSk7NL4yDdVjPnRNpM0hG+ncFmDYJo9O8jaSRcAitVbuVawyXCRoxGrT5Q==", + "version": "27.2.0", + "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-27.2.0.tgz", + "integrity": "sha512-SjRWhnr+qO8aBsrcnYIyF+qRxNZk6MZH8TIDgvi+VlsyrvOyqg0d+Rm/v9KHiTtC9mGGeFi9BFqgavyWib6xLg==", "dev": true, "requires": { - "@jest/test-result": "^25.5.0", - "@jest/types": "^25.5.0", + "@jest/test-result": "^27.2.0", + "@jest/types": "^27.1.1", + "@types/node": "*", "ansi-escapes": "^4.2.1", - "chalk": "^3.0.0", - "jest-util": "^25.5.0", - "string-length": "^3.1.0" - }, - "dependencies": { - "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" - } - } + "chalk": "^4.0.0", + "jest-util": "^27.2.0", + "string-length": "^4.0.1" } }, "jest-worker": { - "version": "25.5.0", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-25.5.0.tgz", - "integrity": "sha512-/dsSmUkIy5EBGfv/IjjqmFxrNAUpBERfGs1oHROyD7yxjG/w+t0GOJDX8O1k32ySmd7+a5IhnJU2qQFcJ4n1vw==", + "version": "27.2.0", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.2.0.tgz", + "integrity": "sha512-laB0ZVIBz+voh/QQy9dmUuuDsadixeerrKqyVpgPz+CCWiOYjOBabUXHIXZhsdvkWbLqSHbgkAHWl5cg24Q6RA==", "dev": true, "requires": { + "@types/node": "*", "merge-stream": "^2.0.0", - "supports-color": "^7.0.0" + "supports-color": "^8.0.0" + }, + "dependencies": { + "supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } } }, "jpjs": { @@ -9080,50 +8838,45 @@ "esprima": "^4.0.0" } }, - "jsbn": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", - "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", - "dev": true - }, "jsdom": { - "version": "15.2.1", - "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-15.2.1.tgz", - "integrity": "sha512-fAl1W0/7T2G5vURSyxBzrJ1LSdQn6Tr5UX/xD4PXDx/PDgwygedfW6El/KIj3xJ7FU61TTYnc/l/B7P49Eqt6g==", - "dev": true, - "requires": { - "abab": "^2.0.0", - "acorn": "^7.1.0", - "acorn-globals": "^4.3.2", - "array-equal": "^1.0.0", - "cssom": "^0.4.1", - "cssstyle": "^2.0.0", - "data-urls": "^1.1.0", - "domexception": "^1.0.1", - "escodegen": "^1.11.1", - "html-encoding-sniffer": "^1.0.2", + "version": "16.7.0", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.7.0.tgz", + "integrity": "sha512-u9Smc2G1USStM+s/x1ru5Sxrl6mPYCbByG1U/hUmqaVsm4tbNyS7CicOSRyuGQYZhTu0h84qkZZQ/I+dzizSVw==", + "dev": true, + "requires": { + "abab": "^2.0.5", + "acorn": "^8.2.4", + "acorn-globals": "^6.0.0", + "cssom": "^0.4.4", + "cssstyle": "^2.3.0", + "data-urls": "^2.0.0", + "decimal.js": "^10.2.1", + "domexception": "^2.0.1", + "escodegen": "^2.0.0", + "form-data": "^3.0.0", + "html-encoding-sniffer": "^2.0.1", + "http-proxy-agent": "^4.0.1", + "https-proxy-agent": "^5.0.0", + "is-potential-custom-element-name": "^1.0.1", "nwsapi": "^2.2.0", - "parse5": "5.1.0", - "pn": "^1.1.0", - "request": "^2.88.0", - "request-promise-native": "^1.0.7", - "saxes": "^3.1.9", - "symbol-tree": "^3.2.2", - "tough-cookie": "^3.0.1", - "w3c-hr-time": "^1.0.1", - "w3c-xmlserializer": "^1.1.2", - "webidl-conversions": "^4.0.2", + "parse5": "6.0.1", + "saxes": "^5.0.1", + "symbol-tree": "^3.2.4", + "tough-cookie": "^4.0.0", + "w3c-hr-time": "^1.0.2", + "w3c-xmlserializer": "^2.0.0", + "webidl-conversions": "^6.1.0", "whatwg-encoding": "^1.0.5", "whatwg-mimetype": "^2.3.0", - "whatwg-url": "^7.0.0", - "ws": "^7.0.0", + "whatwg-url": "^8.5.0", + "ws": "^7.4.6", "xml-name-validator": "^3.0.0" }, "dependencies": { "acorn": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", - "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", + "version": "8.5.0", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.5.0.tgz", + "integrity": "sha512-yXbYeFy+jUuYd3/CDcg2NkIYE991XYX/bje7LmjJigUciaeO1JR4XxXgCIV1/Zc/dRuFEyw1L0pbA+qynJkW5Q==", "dev": true } } @@ -9146,12 +8899,6 @@ "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", "dev": true }, - "json-schema": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", - "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=", - "dev": true - }, "json-schema-traverse": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", @@ -9195,18 +8942,6 @@ "integrity": "sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=", "dev": true }, - "jsprim": { - "version": "1.4.1", - "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", - "integrity": "sha1-MT5mvB5cwG5Di8G3SZwuXFastqI=", - "dev": true, - "requires": { - "assert-plus": "1.0.0", - "extsprintf": "1.3.0", - "json-schema": "0.2.3", - "verror": "1.10.0" - } - }, "jsx-ast-utils": { "version": "3.2.0", "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.2.0.tgz", @@ -9280,13 +9015,13 @@ "dev": true }, "levn": { - "version": "0.3.0", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", - "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", + "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", "dev": true, "requires": { - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2" + "prelude-ls": "^1.2.1", + "type-check": "~0.4.0" } }, "lie": { @@ -9387,6 +9122,12 @@ "integrity": "sha1-+CbJtOKoUR2E46yinbBeGk87cqk=", "dev": true }, + "lodash.clonedeep": { + "version": "4.5.0", + "resolved": "https://registry.npmjs.org/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz", + "integrity": "sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=", + "dev": true + }, "lodash.debounce": { "version": "4.0.8", "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz", @@ -9472,10 +9213,10 @@ "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", "dev": true }, - "lodash.sortby": { - "version": "4.7.0", - "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz", - "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=", + "lodash.truncate": { + "version": "4.4.2", + "resolved": "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz", + "integrity": "sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=", "dev": true }, "lodash.union": { @@ -9495,70 +9236,13 @@ "dev": true }, "log-symbols": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-3.0.0.tgz", - "integrity": "sha512-dSkNGuI7iG3mfvDzUuYZyvk5dD9ocYCYzNU6CYDE6+Xqd+gwme6Z00NS3dUh8mq/73HaEtT7m6W+yUPtU6BZnQ==", + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", + "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==", "dev": true, "requires": { - "chalk": "^2.4.2" - }, - "dependencies": { - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "chalk": { - "version": "2.4.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", - "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.1", - "escape-string-regexp": "^1.0.5", - "supports-color": "^5.3.0" - } - }, - "color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "requires": { - "color-name": "1.1.3" - } - }, - "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", - "dev": true - }, - "escape-string-regexp": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=", - "dev": true - }, - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", - "dev": true - }, - "supports-color": { - "version": "5.5.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", - "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", - "dev": true, - "requires": { - "has-flag": "^3.0.0" - } - } + "chalk": "^4.1.0", + "is-unicode-supported": "^0.1.0" } }, "log-update": { @@ -9655,15 +9339,6 @@ } } }, - "lolex": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/lolex/-/lolex-5.1.2.tgz", - "integrity": "sha512-h4hmjAvHTmd+25JSwrtTIuwbKdwg5NzZVRMLn9saij4SZaepCrTCxPr35H/3bjwfMJtN+t3CX8672UIkglz28A==", - "dev": true, - "requires": { - "@sinonjs/commons": "^1.7.0" - } - }, "loose-envify": { "version": "1.4.0", "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", @@ -10166,9 +9841,9 @@ } }, "mri": { - "version": "1.1.6", - "resolved": "https://registry.npmjs.org/mri/-/mri-1.1.6.tgz", - "integrity": "sha512-oi1b3MfbyGa7FJMP9GmLTttni5JoICpYBRlq+x5V16fZbLsnL9N3wFqqIm/nIG43FjUFkFh9Epzp/kzUGUnJxQ==", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/mri/-/mri-1.2.0.tgz", + "integrity": "sha512-tzzskb3bG8LvYGFF/mDTpq3jpI6Q9wc3LEmBaghu+DdCssd1FakN7Bc0hVNmEyGq1bq3RgfkCb3cmQLpNPOroA==", "dev": true }, "ms": { @@ -10177,12 +9852,6 @@ "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=", "dev": true }, - "mute-stream": { - "version": "0.0.8", - "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz", - "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==", - "dev": true - }, "nanoid": { "version": "3.1.25", "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.1.25.tgz", @@ -10226,12 +9895,6 @@ "integrity": "sha1-5tq3/r9a2Bbqgc9cYpxaDr3nLBo=", "dev": true }, - "nice-try": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", - "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==", - "dev": true - }, "no-case": { "version": "3.0.4", "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz", @@ -10308,39 +9971,6 @@ "integrity": "sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=", "dev": true }, - "node-notifier": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-6.0.0.tgz", - "integrity": "sha512-SVfQ/wMw+DesunOm5cKqr6yDcvUTDl/yc97ybGHMrteNEY6oekXpNpS3lZwgLlwz0FLgHoiW28ZpmBHUDg37cw==", - "dev": true, - "optional": true, - "requires": { - "growly": "^1.3.0", - "is-wsl": "^2.1.1", - "semver": "^6.3.0", - "shellwords": "^0.1.1", - "which": "^1.3.1" - }, - "dependencies": { - "is-wsl": { - "version": "2.2.0", - "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz", - "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==", - "dev": true, - "optional": true, - "requires": { - "is-docker": "^2.0.0" - } - }, - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true, - "optional": true - } - } - }, "node-releases": { "version": "1.1.73", "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.73.tgz", @@ -12494,12 +12124,6 @@ "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==", "dev": true }, - "oauth-sign": { - "version": "0.9.0", - "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", - "integrity": "sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==", - "dev": true - }, "object-assign": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", @@ -12648,54 +12272,34 @@ } }, "optionator": { - "version": "0.8.3", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz", - "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==", + "version": "0.9.1", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.1.tgz", + "integrity": "sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==", "dev": true, "requires": { - "deep-is": "~0.1.3", - "fast-levenshtein": "~2.0.6", - "levn": "~0.3.0", - "prelude-ls": "~1.1.2", - "type-check": "~0.3.2", - "word-wrap": "~1.2.3" + "deep-is": "^0.1.3", + "fast-levenshtein": "^2.0.6", + "levn": "^0.4.1", + "prelude-ls": "^1.2.1", + "type-check": "^0.4.0", + "word-wrap": "^1.2.3" } - }, - "ora": { - "version": "4.1.1", - "resolved": "https://registry.npmjs.org/ora/-/ora-4.1.1.tgz", - "integrity": "sha512-sjYP8QyVWBpBZWD6Vr1M/KwknSw6kJOz41tvGMlwWeClHBtYKTbHMki1PsLZnxKpXMPbTKv9b3pjQu3REib96A==", - "dev": true, - "requires": { - "chalk": "^3.0.0", - "cli-cursor": "^3.1.0", - "cli-spinners": "^2.2.0", - "is-interactive": "^1.0.0", - "log-symbols": "^3.0.0", - "mute-stream": "0.0.8", - "strip-ansi": "^6.0.0", - "wcwidth": "^1.0.1" - }, - "dependencies": { - "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" - } - }, - "strip-ansi": { - "version": "6.0.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", - "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", - "dev": true, - "requires": { - "ansi-regex": "^5.0.0" - } - } + }, + "ora": { + "version": "5.4.1", + "resolved": "https://registry.npmjs.org/ora/-/ora-5.4.1.tgz", + "integrity": "sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==", + "dev": true, + "requires": { + "bl": "^4.1.0", + "chalk": "^4.1.0", + "cli-cursor": "^3.1.0", + "cli-spinners": "^2.5.0", + "is-interactive": "^1.0.0", + "is-unicode-supported": "^0.1.0", + "log-symbols": "^4.1.0", + "strip-ansi": "^6.0.0", + "wcwidth": "^1.0.1" } }, "os-browserify": { @@ -12704,12 +12308,6 @@ "integrity": "sha1-hUNzx/XCMVkU/Jv8a9gjj92h7Cc=", "dev": true }, - "os-tmpdir": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz", - "integrity": "sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=", - "dev": true - }, "p-each-series": { "version": "2.2.0", "resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-2.2.0.tgz", @@ -12733,12 +12331,6 @@ } } }, - "p-finally": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", - "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=", - "dev": true - }, "p-is-promise": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/p-is-promise/-/p-is-promise-3.0.0.tgz", @@ -12845,9 +12437,9 @@ } }, "parse5": { - "version": "5.1.0", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.0.tgz", - "integrity": "sha512-fxNG2sQjHvlVAYmzBZS9YlDp6PTSSDwa98vkD4QgVDDCAo84z5X1t5XyJQ62ImdLXx5NdIIfihey6xpum9/gRQ==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-6.0.1.tgz", + "integrity": "sha512-Ofn/CTFzRGTTxwpNEs9PP93gXShHcTq255nzRYSKe8AkVpZY7e1fpmTfOyoIvjP5HG7Z2ZM7VS9PPhQGW2pOpw==", "dev": true }, "pascal-case": { @@ -12891,9 +12483,9 @@ "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" }, "path-key": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", - "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=", + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", "dev": true }, "path-parse": { @@ -12921,12 +12513,6 @@ "sha.js": "^2.4.8" } }, - "performance-now": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", - "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=", - "dev": true - }, "picomatch": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz", @@ -13066,12 +12652,6 @@ } } }, - "pn": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/pn/-/pn-1.1.0.tgz", - "integrity": "sha512-2qHaIQr2VLRFoxe2nASzsV6ef4yOOH+Fi9FBOVH6cqeSgUnoyySPZkxzLuzd+RYOQTRpROA0ztTMqxROKSb/nA==", - "dev": true - }, "pnp-webpack-plugin": { "version": "1.7.0", "resolved": "https://registry.npmjs.org/pnp-webpack-plugin/-/pnp-webpack-plugin-1.7.0.tgz", @@ -13407,15 +12987,15 @@ "dev": true }, "prelude-ls": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", - "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=", + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", + "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", "dev": true }, "prettier": { - "version": "1.19.1", - "resolved": "https://registry.npmjs.org/prettier/-/prettier-1.19.1.tgz", - "integrity": "sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==", + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.4.0.tgz", + "integrity": "sha512-DsEPLY1dE5HF3BxCRBmD4uYZ+5DCbvatnolqTqcxEgKVZnL2kUfyu7b8pPQ5+hTBkdhU9SLUmK0/pHb07RE4WQ==", "dev": true }, "prettier-linter-helpers": { @@ -13428,15 +13008,23 @@ } }, "pretty-format": { - "version": "25.5.0", - "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-25.5.0.tgz", - "integrity": "sha512-kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ==", + "version": "27.2.0", + "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-27.2.0.tgz", + "integrity": "sha512-KyJdmgBkMscLqo8A7K77omgLx5PWPiXJswtTtFV7XgVZv2+qPk6UivpXXO+5k6ZEbWIbLoKdx1pZ6ldINzbwTA==", "dev": true, "requires": { - "@jest/types": "^25.5.0", + "@jest/types": "^27.1.1", "ansi-regex": "^5.0.0", - "ansi-styles": "^4.0.0", - "react-is": "^16.12.0" + "ansi-styles": "^5.0.0", + "react-is": "^17.0.1" + }, + "dependencies": { + "ansi-styles": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-5.2.0.tgz", + "integrity": "sha512-Cxwpt2SfTzTtXcfOlzGEee8O+c+MmUgGrNiBcXnuWxuFJHe6a5Hz7qwhwe5OgaSYI0IJvkLqWX1ASG+cJOkEiA==", + "dev": true + } } }, "printj": { @@ -13462,9 +13050,9 @@ "dev": true }, "progress-estimator": { - "version": "0.2.2", - "resolved": "https://registry.npmjs.org/progress-estimator/-/progress-estimator-0.2.2.tgz", - "integrity": "sha512-GF76Ac02MTJD6o2nMNtmtOFjwWCnHcvXyn5HOWPQnEMO8OTLw7LAvNmrwe8LmdsB+eZhwUu9fX/c9iQnBxWaFA==", + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/progress-estimator/-/progress-estimator-0.3.0.tgz", + "integrity": "sha512-vGKF+OgSjguKo+sbpgxE0c+HCNBf9QJsTgYXIUIGrriTBbZvPSVxjEed5JrurqMFDL+JthvX+amPP6a0TvpIkA==", "dev": true, "requires": { "chalk": "^2.4.1", @@ -13562,6 +13150,14 @@ "loose-envify": "^1.4.0", "object-assign": "^4.1.1", "react-is": "^16.8.1" + }, + "dependencies": { + "react-is": { + "version": "16.13.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", + "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", + "dev": true + } } }, "prr": { @@ -13643,12 +13239,6 @@ "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=", "dev": true }, - "qs": { - "version": "6.5.2", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", - "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==", - "dev": true - }, "querystring": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", @@ -13713,9 +13303,9 @@ } }, "react-is": { - "version": "16.13.1", - "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz", - "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==", + "version": "17.0.2", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz", + "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==", "dev": true }, "read-pkg": { @@ -13832,12 +13422,6 @@ "picomatch": "^2.2.1" } }, - "realpath-native": { - "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", "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.6.2.tgz", @@ -13873,12 +13457,12 @@ "dev": true }, "regenerate-unicode-properties": { - "version": "8.2.0", - "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz", - "integrity": "sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==", + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-9.0.0.tgz", + "integrity": "sha512-3E12UeNSPfjrgwjkR81m5J7Aw/T55Tu7nUyZVQYCKEOs+2dkxEY+DpPtZzO4YruuiPb7NkYLVcyJC4+zCbk5pA==", "dev": true, "requires": { - "regenerate": "^1.4.0" + "regenerate": "^1.4.2" } }, "regenerator-runtime": { @@ -13923,17 +13507,17 @@ "dev": true }, "regexpu-core": { - "version": "4.7.1", - "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.1.tgz", - "integrity": "sha512-ywH2VUraA44DZQuRKzARmw6S66mr48pQVva4LBeRhcOltJ6hExvWly5ZjFLYo67xbIxb6W1q4bAGtgfEl20zfQ==", + "version": "4.8.0", + "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.8.0.tgz", + "integrity": "sha512-1F6bYsoYiz6is+oz70NWur2Vlh9KWtswuRuzJOfeYUrfPX2o8n74AnUVaOGDbUqVGO9fNHu48/pjJO4sNVwsOg==", "dev": true, "requires": { - "regenerate": "^1.4.0", - "regenerate-unicode-properties": "^8.2.0", - "regjsgen": "^0.5.1", - "regjsparser": "^0.6.4", - "unicode-match-property-ecmascript": "^1.0.4", - "unicode-match-property-value-ecmascript": "^1.2.0" + "regenerate": "^1.4.2", + "regenerate-unicode-properties": "^9.0.0", + "regjsgen": "^0.5.2", + "regjsparser": "^0.7.0", + "unicode-match-property-ecmascript": "^2.0.0", + "unicode-match-property-value-ecmascript": "^2.0.0" } }, "registry-auth-token": { @@ -13952,9 +13536,9 @@ "dev": true }, "regjsparser": { - "version": "0.6.9", - "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.6.9.tgz", - "integrity": "sha512-ZqbNRz1SNjLAiYuwY0zoXW8Ne675IX5q+YHioAGbCw4X96Mjl2+dcX9B2ciaeyYjViDAfvIjFpQjJgLttTEERQ==", + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/regjsparser/-/regjsparser-0.7.0.tgz", + "integrity": "sha512-A4pcaORqmNMDVwUjWoTzuhwMGpP+NykpfqAsEgI1FSH/EzC7lrN5TMd+kN8YCovX+jMpu8eaqXgXPCa0g8FQNQ==", "dev": true, "requires": { "jsesc": "~0.5.0" @@ -13972,7 +13556,8 @@ "version": "1.1.0", "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=", - "dev": true + "dev": true, + "optional": true }, "repeat-element": { "version": "1.1.4", @@ -13986,87 +13571,15 @@ "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=", "dev": true }, - "request": { - "version": "2.88.2", - "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", - "integrity": "sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==", - "dev": true, - "requires": { - "aws-sign2": "~0.7.0", - "aws4": "^1.8.0", - "caseless": "~0.12.0", - "combined-stream": "~1.0.6", - "extend": "~3.0.2", - "forever-agent": "~0.6.1", - "form-data": "~2.3.2", - "har-validator": "~5.1.3", - "http-signature": "~1.2.0", - "is-typedarray": "~1.0.0", - "isstream": "~0.1.2", - "json-stringify-safe": "~5.0.1", - "mime-types": "~2.1.19", - "oauth-sign": "~0.9.0", - "performance-now": "^2.1.0", - "qs": "~6.5.2", - "safe-buffer": "^5.1.2", - "tough-cookie": "~2.5.0", - "tunnel-agent": "^0.6.0", - "uuid": "^3.3.2" - }, - "dependencies": { - "tough-cookie": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", - "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", - "dev": true, - "requires": { - "psl": "^1.1.28", - "punycode": "^2.1.1" - } - } - } - }, - "request-promise-core": { - "version": "1.1.4", - "resolved": "https://registry.npmjs.org/request-promise-core/-/request-promise-core-1.1.4.tgz", - "integrity": "sha512-TTbAfBBRdWD7aNNOoVOBH4pN/KigV6LyapYNNlAPA8JwbovRti1E88m3sYAwsLi5ryhPKsE9APwnjFTgdUjTpw==", - "dev": true, - "requires": { - "lodash": "^4.17.19" - } - }, - "request-promise-native": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/request-promise-native/-/request-promise-native-1.0.9.tgz", - "integrity": "sha512-wcW+sIUiWnKgNY0dqCpOZkUbF/I+YPi+f09JZIDa39Ec+q82CpSYniDp+ISgTTbKmnpJWASeJBPZmoxH84wt3g==", - "dev": true, - "requires": { - "request-promise-core": "1.1.4", - "stealthy-require": "^1.1.1", - "tough-cookie": "^2.3.3" - }, - "dependencies": { - "tough-cookie": { - "version": "2.5.0", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.5.0.tgz", - "integrity": "sha512-nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g==", - "dev": true, - "requires": { - "psl": "^1.1.28", - "punycode": "^2.1.1" - } - } - } - }, "require-directory": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", "integrity": "sha1-jGStX9MNqxyXbiNE/+f3kqam30I=" }, - "require-main-filename": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", - "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", + "require-from-string": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", + "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", "dev": true }, "resolve": { @@ -14167,22 +13680,12 @@ } }, "rollup": { - "version": "1.32.1", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-1.32.1.tgz", - "integrity": "sha512-/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A==", + "version": "2.56.3", + "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.56.3.tgz", + "integrity": "sha512-Au92NuznFklgQCUcV96iXlxUbHuB1vQMaH76DHl5M11TotjOHwqk9CwcrT78+Tnv4FN9uTBxq6p4EJoYkpyekg==", "dev": true, "requires": { - "@types/estree": "*", - "@types/node": "*", - "acorn": "^7.1.0" - }, - "dependencies": { - "acorn": { - "version": "7.4.1", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", - "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==", - "dev": true - } + "fsevents": "~2.3.2" } }, "rollup-plugin-sourcemaps": { @@ -14208,41 +13711,67 @@ } }, "rollup-plugin-terser": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-5.3.1.tgz", - "integrity": "sha512-1pkwkervMJQGFYvM9nscrUoncPwiKR/K+bHdjv6PFgRo3cgPHoRT83y2Aa3GvINj4539S15t/tpFPb775TDs6w==", + "version": "7.0.2", + "resolved": "https://registry.npmjs.org/rollup-plugin-terser/-/rollup-plugin-terser-7.0.2.tgz", + "integrity": "sha512-w3iIaU4OxcF52UUXiZNsNeuXIMDvFrr+ZXK6bFZ0Q60qyVfq4uLptoS4bbq3paG3x216eQllFZX7zt6TIImguQ==", "dev": true, "requires": { - "@babel/code-frame": "^7.5.5", - "jest-worker": "^24.9.0", - "rollup-pluginutils": "^2.8.2", + "@babel/code-frame": "^7.10.4", + "jest-worker": "^26.2.1", "serialize-javascript": "^4.0.0", - "terser": "^4.6.2" + "terser": "^5.0.0" }, "dependencies": { - "has-flag": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", - "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=", + "commander": { + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", "dev": true }, "jest-worker": { - "version": "24.9.0", - "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-24.9.0.tgz", - "integrity": "sha512-51PE4haMSXcHohnSMdM42anbvZANYTqMrr52tVKPqqsPJMzoP6FYYDVqahX/HrAoKEKz3uUPzSvKs9A3qR4iVw==", + "version": "26.6.2", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz", + "integrity": "sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==", "dev": true, "requires": { + "@types/node": "*", "merge-stream": "^2.0.0", - "supports-color": "^6.1.0" + "supports-color": "^7.0.0" } }, - "supports-color": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-6.1.0.tgz", - "integrity": "sha512-qe1jfm1Mg7Nq/NSh6XE24gPXROEVsWHxC1LIx//XNlD9iw7YZQGjZNjYN7xGaEG6iKdA8EtNFW6R0gjnVXp+wQ==", + "source-map": { + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", + "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==", + "dev": true + }, + "source-map-support": { + "version": "0.5.20", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.20.tgz", + "integrity": "sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw==", "dev": true, "requires": { - "has-flag": "^3.0.0" + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + } + } + }, + "terser": { + "version": "5.8.0", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.8.0.tgz", + "integrity": "sha512-f0JH+6yMpneYcRJN314lZrSwu9eKkUFEHLN/kNy8ceh8gaRiLgFPJqrB9HsXjhEGdv4e/ekjTOFxIlL6xlma8A==", + "dev": true, + "requires": { + "commander": "^2.20.0", + "source-map": "~0.7.2", + "source-map-support": "~0.5.20" } } } @@ -14261,9 +13790,9 @@ }, "dependencies": { "find-cache-dir": { - "version": "3.3.1", - "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.1.tgz", - "integrity": "sha512-t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ==", + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz", + "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==", "dev": true, "requires": { "commondir": "^1.0.1", @@ -14372,35 +13901,6 @@ } } }, - "rollup-pluginutils": { - "version": "2.8.2", - "resolved": "https://registry.npmjs.org/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz", - "integrity": "sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==", - "dev": true, - "requires": { - "estree-walker": "^0.6.1" - }, - "dependencies": { - "estree-walker": { - "version": "0.6.1", - "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-0.6.1.tgz", - "integrity": "sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==", - "dev": true - } - } - }, - "rsvp": { - "version": "4.8.5", - "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz", - "integrity": "sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==", - "dev": true - }, - "run-async": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/run-async/-/run-async-2.4.1.tgz", - "integrity": "sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ==", - "dev": true - }, "run-parallel": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", @@ -14419,23 +13919,6 @@ "aproba": "^1.1.1" } }, - "rxjs": { - "version": "6.6.7", - "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.7.tgz", - "integrity": "sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==", - "dev": true, - "requires": { - "tslib": "^1.9.0" - }, - "dependencies": { - "tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true - } - } - }, "sade": { "version": "1.7.4", "resolved": "https://registry.npmjs.org/sade/-/sade-1.7.4.tgz", @@ -14465,90 +13948,13 @@ "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", "dev": true }, - "sane": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/sane/-/sane-4.1.0.tgz", - "integrity": "sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA==", - "dev": true, - "requires": { - "@cnakazawa/watch": "^1.0.3", - "anymatch": "^2.0.0", - "capture-exit": "^2.0.0", - "exec-sh": "^0.3.2", - "execa": "^1.0.0", - "fb-watchman": "^2.0.0", - "micromatch": "^3.1.4", - "minimist": "^1.1.1", - "walker": "~1.0.5" - }, - "dependencies": { - "anymatch": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-2.0.0.tgz", - "integrity": "sha512-5teOsQWABXHHBFP9y3skS5P3d/WfWXpv3FUpy+LorMrNYaT9pI4oLMQX7jzQ2KklNpGpWHzdCXTDT2Y3XGlZBw==", - "dev": true, - "requires": { - "micromatch": "^3.1.4", - "normalize-path": "^2.1.1" - } - }, - "execa": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz", - "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==", - "dev": true, - "requires": { - "cross-spawn": "^6.0.0", - "get-stream": "^4.0.0", - "is-stream": "^1.1.0", - "npm-run-path": "^2.0.0", - "p-finally": "^1.0.0", - "signal-exit": "^3.0.0", - "strip-eof": "^1.0.0" - } - }, - "get-stream": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", - "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==", - "dev": true, - "requires": { - "pump": "^3.0.0" - } - }, - "is-stream": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", - "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=", - "dev": true - }, - "normalize-path": { - "version": "2.1.1", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", - "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", - "dev": true, - "requires": { - "remove-trailing-separator": "^1.0.1" - } - }, - "npm-run-path": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz", - "integrity": "sha1-NakjLfo11wZ7TLLd8jV7GHFTbF8=", - "dev": true, - "requires": { - "path-key": "^2.0.0" - } - } - } - }, "saxes": { - "version": "3.1.11", - "resolved": "https://registry.npmjs.org/saxes/-/saxes-3.1.11.tgz", - "integrity": "sha512-Ydydq3zC+WYDJK1+gRxRapLIED9PWeSuuS41wqyoRmzvhhh9nc+QQrVMKJYzJFULazeGhzSV0QleN2wD3boh2g==", + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz", + "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==", "dev": true, "requires": { - "xmlchars": "^2.1.1" + "xmlchars": "^2.2.0" } }, "schema-utils": { @@ -14895,12 +14301,6 @@ "randombytes": "^2.1.0" } }, - "set-blocking": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=", - "dev": true - }, "set-immediate-shim": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/set-immediate-shim/-/set-immediate-shim-1.0.1.tgz", @@ -14945,18 +14345,18 @@ } }, "shebang-command": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", - "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", "dev": true, "requires": { - "shebang-regex": "^1.0.0" + "shebang-regex": "^3.0.0" } }, "shebang-regex": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", - "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=", + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", "dev": true }, "shelljs": { @@ -14970,13 +14370,6 @@ "rechoir": "^0.6.2" } }, - "shellwords": { - "version": "0.1.1", - "resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz", - "integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==", - "dev": true, - "optional": true - }, "side-channel": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.0.4.tgz", @@ -15095,72 +14488,40 @@ "integrity": "sha512-522c33FTs09sDCN3SUjtxF3Jg361O8Xm1Rh9MUuGGVwY7XGvroE/vL20+//qGltUprGzYQONBbzy9TTdOJWgbw==", "dev": true, "requires": { - "bytes-iec": "^3.1.1", - "chokidar": "^3.5.2", - "ci-job-number": "^1.2.2", - "colorette": "^1.3.0", - "globby": "^11.0.4", - "lilconfig": "^2.0.3", - "mico-spinner": "^1.2.2" - }, - "dependencies": { - "colorette": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.3.0.tgz", - "integrity": "sha512-ecORCqbSFP7Wm8Y6lyqMJjexBQqXSF7SSeaTyGGphogUjBlFP9m9o08wy86HL2uB7fMTxtOUzLMk7ogKcxMg1w==", - "dev": true - } - } - }, - "slash": { - "version": "3.0.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", - "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", - "dev": true - }, - "slice-ansi": { - "version": "2.1.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-2.1.0.tgz", - "integrity": "sha512-Qu+VC3EwYLldKa1fCxuuvULvSJOKEgk9pi8dZeCVK7TqBfUNTH4sFkk4joj8afVSfAYgJoSOetjx9QWOJ5mYoQ==", - "dev": true, - "requires": { - "ansi-styles": "^3.2.0", - "astral-regex": "^1.0.0", - "is-fullwidth-code-point": "^2.0.0" - }, - "dependencies": { - "ansi-styles": { - "version": "3.2.1", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", - "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", - "dev": true, - "requires": { - "color-convert": "^1.9.0" - } - }, - "color-convert": { - "version": "1.9.3", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", - "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", - "dev": true, - "requires": { - "color-name": "1.1.3" - } - }, - "color-name": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", + "bytes-iec": "^3.1.1", + "chokidar": "^3.5.2", + "ci-job-number": "^1.2.2", + "colorette": "^1.3.0", + "globby": "^11.0.4", + "lilconfig": "^2.0.3", + "mico-spinner": "^1.2.2" + }, + "dependencies": { + "colorette": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/colorette/-/colorette-1.3.0.tgz", + "integrity": "sha512-ecORCqbSFP7Wm8Y6lyqMJjexBQqXSF7SSeaTyGGphogUjBlFP9m9o08wy86HL2uB7fMTxtOUzLMk7ogKcxMg1w==", "dev": true } } }, + "slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==", + "dev": true + }, + "slice-ansi": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-4.0.0.tgz", + "integrity": "sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==", + "dev": true, + "requires": { + "ansi-styles": "^4.0.0", + "astral-regex": "^2.0.0", + "is-fullwidth-code-point": "^3.0.0" + } + }, "snapdragon": { "version": "0.8.2", "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz", @@ -15411,23 +14772,6 @@ "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=", "dev": true }, - "sshpk": { - "version": "1.16.1", - "resolved": "https://registry.npmjs.org/sshpk/-/sshpk-1.16.1.tgz", - "integrity": "sha512-HXXqVUq7+pcKeLqqZj6mHFUMvXtOJt1uoUx09pFW6011inTMxqI8BA8PM95myrIyyKwdnzjdFjLiE6KBPVtJIg==", - "dev": true, - "requires": { - "asn1": "~0.2.3", - "assert-plus": "^1.0.0", - "bcrypt-pbkdf": "^1.0.0", - "dashdash": "^1.12.0", - "ecc-jsbn": "~0.1.1", - "getpass": "^0.1.1", - "jsbn": "~0.1.0", - "safer-buffer": "^2.0.2", - "tweetnacl": "~0.14.0" - } - }, "ssri": { "version": "6.0.2", "resolved": "https://registry.npmjs.org/ssri/-/ssri-6.0.2.tgz", @@ -15444,12 +14788,13 @@ "dev": true }, "stack-utils": { - "version": "1.0.5", - "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-1.0.5.tgz", - "integrity": "sha512-KZiTzuV3CnSnSvgMRrARVCj+Ht7rMbauGDK0LdVFRGyenwdylpajAp4Q0i6SX8rEmbTpMMf6ryq2gb8pPq2WgQ==", + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.4.tgz", + "integrity": "sha512-ERg+H//lSSYlZhBIUu+wJnqg30AbyBbpZlIhcshpn7BNzpoRODZgfyr9J+8ERf3ooC6af3u7Lcl01nleau7MrA==", "dev": true, "requires": { - "escape-string-regexp": "^2.0.0" + "escape-string-regexp": "^2.0.0", + "source-map-support": "^0.5.20" }, "dependencies": { "escape-string-regexp": { @@ -15457,6 +14802,16 @@ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz", "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==", "dev": true + }, + "source-map-support": { + "version": "0.5.20", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.20.tgz", + "integrity": "sha512-n1lZZ8Ve4ksRqizaBQgxXDgKwttHDhyfQjA6YZZn8+AroHbsIz+JjwxQDxbp+7y5OYCI8t1Yk7etjD9CRd2hIw==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + } } } }, @@ -15481,12 +14836,6 @@ } } }, - "stealthy-require": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz", - "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=", - "dev": true - }, "stream-browserify": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-2.0.2.tgz", @@ -15537,15 +14886,21 @@ "dev": true }, "string-length": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-length/-/string-length-3.1.0.tgz", - "integrity": "sha512-Ttp5YvkGm5v9Ijagtaz1BnN+k9ObpvS0eIBblPMp2YWL8FBmi9qblQ9fexc2k/CXFgrTIteU3jAw3payCnwSTA==", + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz", + "integrity": "sha512-+l6rNN5fYHNhZZy41RXsYptCjA2Igmq4EG7kZAYFQI1E1VTXarr6ZPXBg6eq7Y6eK4FEhY6AJlyuFIb/v/S0VQ==", "dev": true, "requires": { - "astral-regex": "^1.0.0", - "strip-ansi": "^5.2.0" + "char-regex": "^1.0.2", + "strip-ansi": "^6.0.0" } }, + "string-natural-compare": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/string-natural-compare/-/string-natural-compare-3.0.1.tgz", + "integrity": "sha512-n3sPwynL1nwKi3WJ6AIsClwBMa0zTi54fn2oLU6ndfTSIO05xaznjSf15PcBZU6FNWbmN5Q6cxT4V5hGvB4taw==", + "dev": true + }, "string-width": { "version": "4.2.2", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz", @@ -15611,20 +14966,12 @@ } }, "strip-ansi": { - "version": "5.2.0", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", - "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz", + "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==", "dev": true, "requires": { - "ansi-regex": "^4.1.0" - }, - "dependencies": { - "ansi-regex": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.0.tgz", - "integrity": "sha512-1apePfXM1UOSqw0o9IiFAovVz9M5S1Dg+4TrDwfMewQ6p/rmMueb7tWZjQ1rx4Loy1ArBggoqGpfqqdI4rondg==", - "dev": true - } + "ansi-regex": "^5.0.0" } }, "strip-bom": { @@ -15633,12 +14980,6 @@ "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", "dev": true }, - "strip-eof": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", - "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=", - "dev": true - }, "strip-final-newline": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", @@ -15721,39 +15062,36 @@ "dev": true }, "table": { - "version": "5.4.6", - "resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz", - "integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==", + "version": "6.7.1", + "resolved": "https://registry.npmjs.org/table/-/table-6.7.1.tgz", + "integrity": "sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg==", "dev": true, "requires": { - "ajv": "^6.10.2", - "lodash": "^4.17.14", - "slice-ansi": "^2.1.0", - "string-width": "^3.0.0" + "ajv": "^8.0.1", + "lodash.clonedeep": "^4.5.0", + "lodash.truncate": "^4.4.2", + "slice-ansi": "^4.0.0", + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0" }, "dependencies": { - "emoji-regex": { - "version": "7.0.3", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz", - "integrity": "sha512-CwBLREIQ7LvYFB0WyRvwhq5N5qPhc6PMjD6bYggFlI5YyDgl+0vxq5VHbMOFqLg7hfWzmu8T5Z1QofhmTIhItA==", - "dev": true - }, - "is-fullwidth-code-point": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz", - "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", - "dev": true - }, - "string-width": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz", - "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==", + "ajv": { + "version": "8.6.3", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.6.3.tgz", + "integrity": "sha512-SMJOdDP6LqTkD0Uq8qLi+gMwSt0imXLSV080qFVwJCpH9U6Mb+SUGHAXM0KNbcBPguytWyvFxcHgMLe2D2XSpw==", "dev": true, "requires": { - "emoji-regex": "^7.0.1", - "is-fullwidth-code-point": "^2.0.0", - "strip-ansi": "^5.1.0" + "fast-deep-equal": "^3.1.1", + "json-schema-traverse": "^1.0.0", + "require-from-string": "^2.0.2", + "uri-js": "^4.2.2" } + }, + "json-schema-traverse": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", + "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", + "dev": true } } }, @@ -15897,9 +15235,9 @@ "dev": true }, "throat": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/throat/-/throat-5.0.0.tgz", - "integrity": "sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA==", + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/throat/-/throat-6.0.1.tgz", + "integrity": "sha512-8hmiGIJMDlwjg7dlJ4yKGLK8EsYqKgPWbG3b4wjJddKNwc7N7Dpn08Df4szr/sZdMVeOstrdYSsqzX6BYbcB+w==", "dev": true }, "through": { @@ -15943,19 +15281,10 @@ "globrex": "^0.1.2" } }, - "tmp": { - "version": "0.0.33", - "resolved": "https://registry.npmjs.org/tmp/-/tmp-0.0.33.tgz", - "integrity": "sha512-jRCJlojKnZ3addtTOjdIqoRuPEKBvNXcGYqzO6zWZX8KfKEpnGY5jfggJQ3EjKuu8D4bJRr0y+cYJFmYbImXGw==", - "dev": true, - "requires": { - "os-tmpdir": "~1.0.2" - } - }, "tmpl": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz", - "integrity": "sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=", + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.5.tgz", + "integrity": "sha512-3f0uOEAQwIqGuWW2MVzYg8fV/QNnc/IpuJNG837rLuczAaLVHslWHZQj4IGiEl5Hs3kkbhwL9Ab7Hrsmuj+Smw==", "dev": true }, "to-arraybuffer": { @@ -16019,23 +15348,31 @@ "dev": true }, "tough-cookie": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz", - "integrity": "sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==", + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-4.0.0.tgz", + "integrity": "sha512-tHdtEpQCMrc1YLrMaqXXcj6AxhYi/xgit6mZu1+EDWUn+qhUf8wMQoFIy9NXuq23zAwtcB0t/MjACGR18pcRbg==", "dev": true, "requires": { - "ip-regex": "^2.1.0", - "psl": "^1.1.28", - "punycode": "^2.1.1" + "psl": "^1.1.33", + "punycode": "^2.1.1", + "universalify": "^0.1.2" + }, + "dependencies": { + "universalify": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz", + "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==", + "dev": true + } } }, "tr46": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz", - "integrity": "sha1-qLE/1r/SSJUZZ0zN5VujaTtwbQk=", + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.1.0.tgz", + "integrity": "sha512-15Ih7phfcdP5YxqiB+iDtLoaTz4Nd35+IiAv0kQ5FNKHzXgdWqPoTIqEDDJmXceQt4JZk6lVPT8lnDlPpGDppw==", "dev": true, "requires": { - "punycode": "^2.1.0" + "punycode": "^2.1.1" } }, "traverse": { @@ -16056,81 +15393,19 @@ "dev": true }, "ts-jest": { - "version": "25.5.1", - "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-25.5.1.tgz", - "integrity": "sha512-kHEUlZMK8fn8vkxDjwbHlxXRB9dHYpyzqKIGDNxbzs+Rz+ssNDSDNusEK8Fk/sDd4xE6iKoQLfFkFVaskmTJyw==", + "version": "27.0.5", + "resolved": "https://registry.npmjs.org/ts-jest/-/ts-jest-27.0.5.tgz", + "integrity": "sha512-lIJApzfTaSSbtlksfFNHkWOzLJuuSm4faFAfo5kvzOiRAuoN4/eKxVJ2zEAho8aecE04qX6K1pAzfH5QHL1/8w==", "dev": true, "requires": { "bs-logger": "0.x", - "buffer-from": "1.x", "fast-json-stable-stringify": "2.x", + "jest-util": "^27.0.0", "json5": "2.x", - "lodash.memoize": "4.x", + "lodash": "4.x", "make-error": "1.x", - "micromatch": "4.x", - "mkdirp": "0.x", - "semver": "6.x", - "yargs-parser": "18.x" - }, - "dependencies": { - "braces": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.2.tgz", - "integrity": "sha512-b8um+L1RzM3WDSzvhm6gIz1yfTbBt6YTlcEKAvsmqCZZFw46z626lVj9j1yEPW33H5H+lBQpZMP1k8l+78Ha0A==", - "dev": true, - "requires": { - "fill-range": "^7.0.1" - } - }, - "fill-range": { - "version": "7.0.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.0.1.tgz", - "integrity": "sha512-qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ==", - "dev": true, - "requires": { - "to-regex-range": "^5.0.1" - } - }, - "is-number": { - "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", - "dev": true - }, - "micromatch": { - "version": "4.0.4", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz", - "integrity": "sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==", - "dev": true, - "requires": { - "braces": "^3.0.1", - "picomatch": "^2.2.3" - } - }, - "mkdirp": { - "version": "0.5.5", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", - "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", - "dev": true, - "requires": { - "minimist": "^1.2.5" - } - }, - "semver": { - "version": "6.3.0", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true - }, - "to-regex-range": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", - "dev": true, - "requires": { - "is-number": "^7.0.0" - } - } + "semver": "7.x", + "yargs-parser": "20.x" } }, "ts-pnp": { @@ -16162,94 +15437,6 @@ } } }, - "tsdx": { - "version": "0.14.1", - "resolved": "https://registry.npmjs.org/tsdx/-/tsdx-0.14.1.tgz", - "integrity": "sha512-keHmFdCL2kx5nYFlBdbE3639HQ2v9iGedAFAajobrUTH2wfX0nLPdDhbHv+GHLQZqf0c5ur1XteE8ek/+Eyj5w==", - "dev": true, - "requires": { - "@babel/core": "^7.4.4", - "@babel/helper-module-imports": "^7.0.0", - "@babel/parser": "^7.11.5", - "@babel/plugin-proposal-class-properties": "^7.4.4", - "@babel/preset-env": "^7.11.0", - "@babel/traverse": "^7.11.5", - "@rollup/plugin-babel": "^5.1.0", - "@rollup/plugin-commonjs": "^11.0.0", - "@rollup/plugin-json": "^4.0.0", - "@rollup/plugin-node-resolve": "^9.0.0", - "@rollup/plugin-replace": "^2.2.1", - "@types/jest": "^25.2.1", - "@typescript-eslint/eslint-plugin": "^2.12.0", - "@typescript-eslint/parser": "^2.12.0", - "ansi-escapes": "^4.2.1", - "asyncro": "^3.0.0", - "babel-eslint": "^10.0.3", - "babel-plugin-annotate-pure-calls": "^0.4.0", - "babel-plugin-dev-expression": "^0.2.1", - "babel-plugin-macros": "^2.6.1", - "babel-plugin-polyfill-regenerator": "^0.0.4", - "babel-plugin-transform-rename-import": "^2.3.0", - "camelcase": "^6.0.0", - "chalk": "^4.0.0", - "enquirer": "^2.3.4", - "eslint": "^6.1.0", - "eslint-config-prettier": "^6.0.0", - "eslint-config-react-app": "^5.2.1", - "eslint-plugin-flowtype": "^3.13.0", - "eslint-plugin-import": "^2.18.2", - "eslint-plugin-jsx-a11y": "^6.2.3", - "eslint-plugin-prettier": "^3.1.0", - "eslint-plugin-react": "^7.14.3", - "eslint-plugin-react-hooks": "^2.2.0", - "execa": "^4.0.3", - "fs-extra": "^9.0.0", - "jest": "^25.3.0", - "jest-watch-typeahead": "^0.5.0", - "jpjs": "^1.2.1", - "lodash.merge": "^4.6.2", - "ora": "^4.0.3", - "pascal-case": "^3.1.1", - "prettier": "^1.19.1", - "progress-estimator": "^0.2.2", - "regenerator-runtime": "^0.13.7", - "rollup": "^1.32.1", - "rollup-plugin-sourcemaps": "^0.6.2", - "rollup-plugin-terser": "^5.1.2", - "rollup-plugin-typescript2": "^0.27.3", - "sade": "^1.4.2", - "semver": "^7.1.1", - "shelljs": "^0.8.3", - "tiny-glob": "^0.2.6", - "ts-jest": "^25.3.1", - "tslib": "^1.9.3", - "typescript": "^3.7.3" - }, - "dependencies": { - "@types/jest": { - "version": "25.2.3", - "resolved": "https://registry.npmjs.org/@types/jest/-/jest-25.2.3.tgz", - "integrity": "sha512-JXc1nK/tXHiDhV55dvfzqtmP4S3sy3T3ouV2tkViZgxY/zeUkcpQcQPGRlgF4KmWzWW5oiWYSZwtCB+2RsE4Fw==", - "dev": true, - "requires": { - "jest-diff": "^25.2.1", - "pretty-format": "^25.2.1" - } - }, - "tslib": { - "version": "1.14.1", - "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", - "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", - "dev": true - }, - "typescript": { - "version": "3.9.10", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.9.10.tgz", - "integrity": "sha512-w6fIxVE/H1PkLKcCPsFqKE7Kv7QUwhU8qQY2MueZXWx5cPZdwFupLgKK3vntcK98BtNHZtAF4LA/yl2a7k8R6Q==", - "dev": true - } - } - }, "tslib": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.3.1.tgz", @@ -16279,28 +15466,13 @@ "integrity": "sha1-oVe6QC2iTpv5V/mqadUk7tQpAaY=", "dev": true }, - "tunnel-agent": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", - "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", - "dev": true, - "requires": { - "safe-buffer": "^5.0.1" - } - }, - "tweetnacl": { - "version": "0.14.5", - "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", - "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=", - "dev": true - }, "type-check": { - "version": "0.3.2", - "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", - "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", + "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", "dev": true, "requires": { - "prelude-ls": "~1.1.2" + "prelude-ls": "^1.2.1" } }, "type-detect": { @@ -16356,31 +15528,31 @@ } }, "unicode-canonical-property-names-ecmascript": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-1.0.4.tgz", - "integrity": "sha512-jDrNnXWHd4oHiTZnx/ZG7gtUTVp+gCcTTKr8L0HjlwphROEW3+Him+IpvC+xcJEFegapiMZyZe02CyuOnRmbnQ==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/unicode-canonical-property-names-ecmascript/-/unicode-canonical-property-names-ecmascript-2.0.0.tgz", + "integrity": "sha512-yY5PpDlfVIU5+y/BSCxAJRBIS1Zc2dDG3Ujq+sR0U+JjUevW2JhocOF+soROYDSaAezOzOKuyyixhD6mBknSmQ==", "dev": true }, "unicode-match-property-ecmascript": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-1.0.4.tgz", - "integrity": "sha512-L4Qoh15vTfntsn4P1zqnHulG0LdXgjSO035fEpdtp6YxXhMT51Q6vgM5lYdG/5X3MjS+k/Y9Xw4SFCY9IkR0rg==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/unicode-match-property-ecmascript/-/unicode-match-property-ecmascript-2.0.0.tgz", + "integrity": "sha512-5kaZCrbp5mmbz5ulBkDkbY0SsPOjKqVS35VpL9ulMPfSl0J0Xsm+9Evphv9CoIZFwre7aJoa94AY6seMKGVN5Q==", "dev": true, "requires": { - "unicode-canonical-property-names-ecmascript": "^1.0.4", - "unicode-property-aliases-ecmascript": "^1.0.4" + "unicode-canonical-property-names-ecmascript": "^2.0.0", + "unicode-property-aliases-ecmascript": "^2.0.0" } }, "unicode-match-property-value-ecmascript": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz", - "integrity": "sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-2.0.0.tgz", + "integrity": "sha512-7Yhkc0Ye+t4PNYzOGKedDhXbYIBe1XEQYQxOPyhcXNMJ0WCABqqj6ckydd6pWRZTHV4GuCPKdBAUiMc60tsKVw==", "dev": true }, "unicode-property-aliases-ecmascript": { - "version": "1.1.0", - "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz", - "integrity": "sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-2.0.0.tgz", + "integrity": "sha512-5Zfuy9q/DFr4tfO7ZPeVXb1aPoeQSdeFMLpYuFebehDAhbuevLs5yxSZmIFN1tP5F9Wl4IpJrYojg85/zgyZHQ==", "dev": true }, "union-value": { @@ -16578,12 +15750,6 @@ "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=" }, - "uuid": { - "version": "3.4.0", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz", - "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==", - "dev": true - }, "v8-compile-cache": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz", @@ -16591,9 +15757,9 @@ "dev": true }, "v8-to-istanbul": { - "version": "4.1.4", - "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-4.1.4.tgz", - "integrity": "sha512-Rw6vJHj1mbdK8edjR7+zuJrpDtKIgNdAvTSAcpYfgMIw+u2dPDntD3dgN4XQFLU2/fvFQdzj+EeSGfd/jnY5fQ==", + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-8.0.0.tgz", + "integrity": "sha512-LkmXi8UUNxnCC+JlH7/fsfsKr5AU110l+SYGJimWNkWhxbN5EyeOtm1MJ0hhvqMMOhGwBj1Fp70Yv9i+hX0QAg==", "dev": true, "requires": { "@types/istanbul-lib-coverage": "^2.0.1", @@ -16625,17 +15791,6 @@ "integrity": "sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w==", "dev": true }, - "verror": { - "version": "1.10.0", - "resolved": "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz", - "integrity": "sha1-OhBcoXBTr1XW4nDB+CiGguGNpAA=", - "dev": true, - "requires": { - "assert-plus": "^1.0.0", - "core-util-is": "1.0.2", - "extsprintf": "^1.2.0" - } - }, "vm-browserify": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-1.1.2.tgz", @@ -16652,13 +15807,11 @@ } }, "w3c-xmlserializer": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-1.1.2.tgz", - "integrity": "sha512-p10l/ayESzrBMYWRID6xbuCKh2Fp77+sA0doRuGn4tTIMrrZVeqfpKjXHY+oDh3K4nLdPgNwMTVP6Vp4pvqbNg==", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz", + "integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==", "dev": true, "requires": { - "domexception": "^1.0.1", - "webidl-conversions": "^4.0.2", "xml-name-validator": "^3.0.0" } }, @@ -16808,9 +15961,9 @@ } }, "webidl-conversions": { - "version": "4.0.2", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz", - "integrity": "sha512-YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg==", + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz", + "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==", "dev": true }, "webpack": { @@ -16943,20 +16096,20 @@ "dev": true }, "whatwg-url": { - "version": "7.1.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz", - "integrity": "sha512-WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg==", + "version": "8.7.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.7.0.tgz", + "integrity": "sha512-gAojqb/m9Q8a5IV96E3fHJM70AzCkgt4uXYX2O7EmuyOnLrViCQlsEBmF9UQIu3/aeAIp2U17rtbpZWNntQqdg==", "dev": true, "requires": { - "lodash.sortby": "^4.7.0", - "tr46": "^1.0.1", - "webidl-conversions": "^4.0.2" + "lodash": "^4.7.0", + "tr46": "^2.1.0", + "webidl-conversions": "^6.1.0" } }, "which": { - "version": "1.3.1", - "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", - "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", + "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" @@ -16975,12 +16128,6 @@ "is-symbol": "^1.0.3" } }, - "which-module": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", - "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=", - "dev": true - }, "word-wrap": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", @@ -17027,26 +16174,6 @@ "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" }, - "write": { - "version": "1.0.3", - "resolved": "https://registry.npmjs.org/write/-/write-1.0.3.tgz", - "integrity": "sha512-/lg70HAjtkUgWPVZhZcm+T4hkL8Zbtp1nFNOn3lRrxnlv50SRBv7cR7RqR+GMsd3hUXy9hWBo4CHTbFTcOYwig==", - "dev": true, - "requires": { - "mkdirp": "^0.5.1" - }, - "dependencies": { - "mkdirp": { - "version": "0.5.5", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.5.tgz", - "integrity": "sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ==", - "dev": true, - "requires": { - "minimist": "^1.2.5" - } - } - } - }, "write-file-atomic": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz", @@ -17127,22 +16254,10 @@ } }, "yargs-parser": { - "version": "18.1.3", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz", - "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==", - "dev": true, - "requires": { - "camelcase": "^5.0.0", - "decamelize": "^1.2.0" - }, - "dependencies": { - "camelcase": { - "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", - "dev": true - } - } + "version": "20.2.9", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", + "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", + "dev": true }, "zip-stream": { "version": "4.1.0", diff --git a/package.json b/package.json index 82fbd28..9f8ac1c 100644 --- a/package.json +++ b/package.json @@ -29,13 +29,13 @@ "node": ">=12" }, "scripts": { - "start": "tsdx watch", - "build": "tsdx build", - "test": "tsdx test", - "test:coverage": "tsdx test --coverage", - "lint": "tsdx lint", - "lint-fix": "tsdx lint --fix", - "prepare": "tsdx build", + "start": "dts watch", + "build": "dts build", + "test": "dts test", + "test:coverage": "dts test --coverage", + "lint": "dts lint", + "lint-fix": "dts lint --fix", + "prepare": "dts build", "size": "size-limit", "analyze": "size-limit --why", "semantic-release": "semantic-release" @@ -43,7 +43,7 @@ "peerDependencies": {}, "husky": { "hooks": { - "pre-commit": "tsdx lint" + "pre-commit": "dts lint" } }, "prettier": { @@ -64,15 +64,15 @@ ], "devDependencies": { "@size-limit/preset-small-lib": "^5.0.3", - "@types/jest": "^26.0.24", - "@types/lodash": "^4.14.172", - "@types/node": "^16.6.1", + "@types/jest": "^27.0.1", + "@types/lodash": "^4.14.173", + "@types/node": "^16.9.2", "@types/yargs": "^17.0.2", + "dts-cli": "^0.17.1", "fsify": "^4.0.2", "husky": "^7.0.2", "semantic-release": "^17.4.7", "size-limit": "^5.0.3", - "tsdx": "^0.14.1", "tslib": "^2.3.1", "typescript": "^4.4.3" }, @@ -82,12 +82,18 @@ "lodash-es": "^4.17.21", "yargs": "^17.1.1" }, - "resolutions": { - "**/@typescript-eslint/eslint-plugin": "^4.29.1", - "**/@typescript-eslint/parser": "^4.29.1", - "**/jest": "^27.0.6", - "**/ts-jest": "^27.0.4", - "**/typescript": "^4.3.5" + "eslintConfig": { + "overrides": [ + { + "files": [ + "*.ts", + "*.js" + ], + "rules": { + "import/no-anonymous-default-export": "off" + } + } + ] }, "homepage": "https://jy95.github.io/i18n-tools/", "repository": { diff --git a/src/checks/diff_checks.ts b/src/checks/diff_checks.ts index d364e90..029db92 100644 --- a/src/checks/diff_checks.ts +++ b/src/checks/diff_checks.ts @@ -5,7 +5,8 @@ import { FILENAME_CHECK } from './export/index'; // For that, we will use "backupKey" from backupPaths : "paths" const pathsProp = 'paths'; export const AT_LEAST_2_PATHS_CHECK = async (argv: any) => { - return Object.values(argv[pathsProp]).filter(v => v !== undefined).length >= 2 + return Object.values(argv[pathsProp]).filter((v) => v !== undefined).length >= + 2 ? true : new Error('At least two paths must be provided'); }; diff --git a/src/checks/export/export_common_checks.ts b/src/checks/export/export_common_checks.ts index 74ce832..1f7e57f 100644 --- a/src/checks/export/export_common_checks.ts +++ b/src/checks/export/export_common_checks.ts @@ -1,66 +1,67 @@ -import fs from "fs"; -import path from "path"; +import fs from 'fs'; +import path from 'path'; // lodash methodes -import isPlainObject from "lodash/isPlainObject"; -import isEmpty from "lodash/isEmpty"; -import uniq from "lodash/uniq"; +import isPlainObject from 'lodash/isPlainObject'; +import isEmpty from 'lodash/isEmpty'; +import uniq from 'lodash/uniq'; // validation for filename option -export const FILENAME_CHECK = async (argv : any) => { - let filename : unknown = argv["filename"]; - if (path.extname(filename as string).length !== 0) { - return new Error(`${filename} has an extension : Remove it please`); - } else { - return true; - } -} +export const FILENAME_CHECK = async (argv: any) => { + let filename: unknown = argv['filename']; + if (path.extname(filename as string).length !== 0) { + return new Error(`${filename} has an extension : Remove it please`); + } else { + return true; + } +}; // validations for files option -export const FILES_CHECK = async (argv : any) => { - let files = argv.files as any; - if (!isPlainObject(files)) { - return new Error("Option files is not a JSON Object"); - } - if (isEmpty(files)) { - return new Error("Option files should have at least one entry"); - } - let entries : [string, any][] = Object.entries(files); - if (uniq(Object.values(files)).length !== entries.length) { - return new Error(`At least a duplicated value in files JSON object was detected`); - } - return Promise.all( - entries.map( - entry => verify_files_entry(entry) - ) - ).then(_ => { - // validated - return true; - }) - .catch(/* istanbul ignore next */ err => { - // failed - return err; - }); -} +export const FILES_CHECK = async (argv: any) => { + let files = argv.files as any; + if (!isPlainObject(files)) { + return new Error('Option files is not a JSON Object'); + } + if (isEmpty(files)) { + return new Error('Option files should have at least one entry'); + } + let entries: [string, any][] = Object.entries(files); + if (uniq(Object.values(files)).length !== entries.length) { + return new Error( + `At least a duplicated value in files JSON object was detected` + ); + } + + try { + await Promise.all(entries.map((entry) => verify_files_entry(entry))); + return true; + } catch (error) { + return error as Error; + } +}; // verify if an entry from files option meet requirements -async function verify_files_entry([_, i18nPath] : [string, any]) : Promise { - let potentialJSON; - // check if file is readable - try { - await fs.promises.access(i18nPath); - potentialJSON = await fs.promises.readFile(i18nPath); - } catch (error) { - return Promise.reject(`${i18nPath} cannot be read : check permissions`); - } - // check if the file is a JSON - try { - JSON.parse(potentialJSON.toString()); - return Promise.resolve(true); - } catch (error) { - return Promise.reject(`${i18nPath} isn't a valid JSON`); - } +async function verify_files_entry([_, i18nPath]: [string, any]): Promise< + boolean | Error +> { + let potentialJSON; + // check if file is readable + try { + await fs.promises.access(i18nPath); + potentialJSON = await fs.promises.readFile(i18nPath); + } catch (error) { + return Promise.reject( + new Error(`${i18nPath} cannot be read : check permissions`) + ); + } + // check if the file is a JSON + try { + JSON.parse(potentialJSON.toString()); + return Promise.resolve(true); + } catch (error) { + return Promise.reject(new Error(`${i18nPath} isn't a valid JSON`)); + } } // export checks in expected order into a single array -export const CHECKS = [FILENAME_CHECK, FILES_CHECK]; \ No newline at end of file +export const CHECKS = [FILENAME_CHECK, FILES_CHECK]; diff --git a/src/checks/export/export_csv_checks.ts b/src/checks/export/export_csv_checks.ts new file mode 100644 index 0000000..1424cdd --- /dev/null +++ b/src/checks/export/export_csv_checks.ts @@ -0,0 +1,4 @@ +import { COLUMNS_CHECK, COLUMNS_AND_FILES_CHECK } from './export_xlsx_checks'; + +// export checks in expected order into a single array +export const CHECKS = [COLUMNS_CHECK, COLUMNS_AND_FILES_CHECK]; diff --git a/src/checks/export/export_xlsx_checks.ts b/src/checks/export/export_xlsx_checks.ts index 11b560f..1e1d501 100644 --- a/src/checks/export/export_xlsx_checks.ts +++ b/src/checks/export/export_xlsx_checks.ts @@ -1,5 +1,6 @@ // lodash methodes import isString from 'lodash/isString'; +import isFunction from 'lodash/isFunction'; import isArray from 'lodash/isArray'; import isEmpty from 'lodash/isEmpty'; import some from 'lodash/some'; @@ -26,13 +27,14 @@ export const COLUMNS_CHECK = async (argv: any) => { { message: (prop: string) => `At least one item in columns array doesn't have "${prop}" property`, - errorDetected: (prop: string) => some(columns, item => !has(item, prop)), + errorDetected: (prop: string) => + some(columns, (item) => !has(item, prop)), }, { message: (prop: string) => `At least one item in columns array doesn't have "${prop}" property with a String value`, errorDetected: (prop: string) => - some(columns, item => !isString(get(item, prop))), + some(columns, (item) => !isString(get(item, prop))), }, { message: (prop: string) => @@ -48,7 +50,7 @@ export const COLUMNS_CHECK = async (argv: any) => { if (acc instanceof Error) { return acc; } else { - let error = find(errors_detectors, rule => rule.errorDetected(prop)); + let error = find(errors_detectors, (rule) => rule.errorDetected(prop)); if (error) { return new Error(error.message(prop)); } else { @@ -76,5 +78,25 @@ export const COLUMNS_AND_FILES_CHECK = async (argv: any) => { } }; +// validations for worksheetCustomizer option +export const WORKSHEETCUSTOMIZER_CHECK = async (argv: any) => { + if ('worksheetCustomizer' in argv) { + let fct = argv.worksheetCustomizer as any; + if (isFunction(fct) && fct.length === 1) { + return true; + } else { + return new Error( + "worksheetCustomizer is not an function or doesn't take an single argument" + ); + } + } else { + return true; + } +}; + // export checks in expected order into a single array -export const CHECKS = [COLUMNS_CHECK, COLUMNS_AND_FILES_CHECK]; +export const CHECKS = [ + COLUMNS_CHECK, + COLUMNS_AND_FILES_CHECK, + WORKSHEETCUSTOMIZER_CHECK, +]; diff --git a/src/checks/export/index.ts b/src/checks/export/index.ts index 3a54e0c..d2e33de 100644 --- a/src/checks/export/index.ts +++ b/src/checks/export/index.ts @@ -1,9 +1,9 @@ // common check for this command -export * from "./export_common_checks"; +export * from './export_common_checks'; // check for xlsx sub command -export * as XLSX from "./export_xlsx_checks"; +export * as XLSX from './export_xlsx_checks'; // check for csv sub command // as it is identical (at that time) to xlsx, simply re-export same module -export * as CSV from "./export_xlsx_checks"; \ No newline at end of file +export * as CSV from './export_csv_checks'; diff --git a/src/checks/import/import_xlsx_checks.ts b/src/checks/import/import_xlsx_checks.ts index 99a3f13..4a91f4d 100644 --- a/src/checks/import/import_xlsx_checks.ts +++ b/src/checks/import/import_xlsx_checks.ts @@ -15,7 +15,7 @@ export const COLUMNS_CHECK = async (argv: any) => { } // check presence of required properties - let missingProp = find(REQUIRED_PROPERTIES, prop => !has(columns, prop)); + let missingProp = find(REQUIRED_PROPERTIES, (prop) => !has(columns, prop)); if (missingProp) { return new Error(`${missingProp} couldn't be found in columns object`); } @@ -31,7 +31,7 @@ export const COLUMNS_CHECK = async (argv: any) => { } // check if locales values all are string - if (!Object.values(columns.locales).every(v => isString(v))) { + if (!Object.values(columns.locales).every((v) => isString(v))) { return new Error( "At least one value for locales key in columns object isn't a string" ); diff --git a/src/checks/import/index.ts b/src/checks/import/index.ts index e6ab476..e950128 100644 --- a/src/checks/import/index.ts +++ b/src/checks/import/index.ts @@ -1,9 +1,9 @@ // common check for this command -export * from "./import_common_checks"; +export * from './import_common_checks'; // check for xlsx sub command -export * as XLSX from "./import_xlsx_checks"; +export * as XLSX from './import_xlsx_checks'; // check for csv sub command // as it is identical (at that time) to xlsx, simply re-export same module -export * as CSV from "./import_xlsx_checks"; \ No newline at end of file +export * as CSV from './import_xlsx_checks'; diff --git a/src/checks/index.ts b/src/checks/index.ts index a77d2d9..d921187 100644 --- a/src/checks/index.ts +++ b/src/checks/index.ts @@ -1,29 +1,29 @@ // re export stuff for easier import -export * as EXPORT_CHECKS from "./export/index"; -export * as IMPORT_CHECKS from "./import/index"; -export * as DIFF_CHECKS from "./diff_checks"; +export * as EXPORT_CHECKS from './export/index'; +export * as IMPORT_CHECKS from './import/index'; +export * as DIFF_CHECKS from './diff_checks'; // Yargs parser doesn't stop when issue(s) occurs and only returns last error. // So I need something that resolves promises sequentially and return first error // See https://github.com/yargs/yargs/issues/1399 // See https://github.com/yargs/yargs/issues/1975 -type PromiseCheck = (argv : any) => Promise; +type PromiseCheck = (argv: any) => Promise; -export const resolveChecksInOrder = (checks : PromiseCheck[]) => { - return async (argv : any) => { - for(let check of checks) { - try { - //console.log(`Check ${check.name}`); // to make easier debugging in the future - let result = await check(argv); - if (result !== true) { - return result; - } - } catch (error) { - /* istanbul ignore next */ - return error; - } +export const resolveChecksInOrder = (checks: PromiseCheck[]) => { + return async (argv: any) => { + for (let check of checks) { + try { + //console.log(`Check ${check.name}`); // to make easier debugging in the future + let result = await check(argv); + if (result !== true) { + return result; } - return true; + } catch (error) { + /* istanbul ignore next */ + return error; + } } -} \ No newline at end of file + return true; + }; +}; diff --git a/src/cmds/diff.ts b/src/cmds/diff.ts index a5f76de..64f47ec 100644 --- a/src/cmds/diff.ts +++ b/src/cmds/diff.ts @@ -1,86 +1,134 @@ -import fs from "fs"; -import path from "path"; +import fs from 'fs'; +import path from 'path'; // checks import -import { - resolveChecksInOrder, - DIFF_CHECKS -} from "../checks/index"; +import { resolveChecksInOrder, DIFF_CHECKS } from '../checks/index'; // For typing // eslint-disable-next-line import type { Argv } from "yargs"; -import { backupPaths, parsePathsToJSON } from "../middlewares/middlewares"; -import { CommonDiffArguments } from "../types/diffTypes"; +import { backupPaths, parsePathsToJSON } from '../middlewares/middlewares'; +import { CommonDiffArguments } from '../types/diffTypes'; // sub fonctions -import detectChanges from "./diff/detectChanges"; -import reporters from "./diff/reporter-strategies/index"; +import detectChanges from './diff/detectChanges'; +import reporters from './diff/reporter-strategies/index'; // checks for this command const CHECKS = DIFF_CHECKS.CHECKS; // named exports export const command = 'diff [files..]'; -export const description = 'Compare at least two i18n files & generate a report'; - -export const builder = function (y : Argv) { - return y - .option("filename", { - type: "string", - alias: "of", - describe: "Name of the output file generated by this CLI (without extension)" - }) - .option("outputDir", { - type: "string", - alias: "od", - describe: "Output folder where to store the output file", - default: process.cwd() - }) - .option("outputFormat", { - describe: "Output format", - choices: ["JSON"], - default: "JSON" - }) - // default value for filename - .default("filename", function() { - const date = new Date(); - const timestamp = `${date.getDate()}-${date.getMonth() + 1}-${date.getFullYear()} ${date.getHours()}h${date.getMinutes()}m${date.getSeconds()}`; - return `diff_report_${timestamp}`; - }) - .config('settings', function (configPath) { - return JSON.parse(fs.readFileSync(configPath, 'utf-8')) - }) - // coerce path provided by outputDir - .coerce(["outputDir"], path.resolve) - // save provided paths into a backup key - .middleware(backupPaths("files", "paths"), true) - // coerce varidic path(s) into Object(s) - .middleware(parsePathsToJSON("files"), true) - // validations - .check(resolveChecksInOrder(CHECKS)) -} +export const description = + 'Compare at least two i18n files & generate a report'; + +// Builder for yargs +export class CommonDiffYargsBuilder { + y: Argv<{ [x: string]: any }>; // current yargs result + + constructor(y: Argv<{ [x: string]: any }>) { + this.y = y; + } + + addFilenameOption() { + this.y = this.y + .option('filename', { + type: 'string', + alias: 'of', + describe: + 'Name of the output file generated by this CLI (without extension)', + }) + // default value for filename + .default('filename', function () { + const date = new Date(); + const timestamp = `${date.getDate()}-${ + date.getMonth() + 1 + }-${date.getFullYear()} ${date.getHours()}h${date.getMinutes()}m${date.getSeconds()}`; + return `diff_report_${timestamp}`; + }); + return this; + } + + addOutputDirOption() { + this.y = this.y + .option('outputDir', { + type: 'string', + alias: 'od', + describe: 'Output folder where to store the output file', + default: process.cwd(), + }) + // coerce path provided by outputDir + .coerce(['outputDir'], path.resolve); + return this; + } -export const handler = async function (argv : any) { - try { - const changes = detectChanges(argv as CommonDiffArguments); - console.log(`Preparing the report file ...`); - await reporters({ - yargs: argv as CommonDiffArguments, - changes: changes - }); - console.log("Successfully wrote the report file"); - return Promise.resolve(undefined); - } catch(/* istanbul ignore next */ err) { - /* istanbul ignore next */ - return Promise.reject(err); - } + addOutputFormatOption() { + this.y = this.y.option('outputFormat', { + describe: 'Output format', + choices: ['JSON'], + default: 'JSON', + }); + return this; + } + + addFilesOption() { + this.y = this.y + // save provided paths into a backup key + .middleware(backupPaths('files', 'paths'), true) + // coerce varidic path(s) into Object(s) + .middleware(parsePathsToJSON('files'), true); + return this; + } + + addSettingConfig() { + this.y = this.y.config('settings', function (configPath) { + let ext = path.extname(configPath); + return /\.js$/i.test(ext) + ? require(configPath) + : JSON.parse(fs.readFileSync(configPath, 'utf-8')); + }); + return this; + } + + build() { + return this.y; + } } +export const builder = function (y: Argv) { + return ( + new CommonDiffYargsBuilder(y) + .addFilenameOption() + .addOutputDirOption() + .addOutputFormatOption() + .addFilesOption() + .addSettingConfig() + .build() + // validations + .check(resolveChecksInOrder(CHECKS)) + ); +}; + +export const handler = async function (argv: any) { + try { + const changes = detectChanges(argv as CommonDiffArguments); + console.log(`Preparing the report file ...`); + await reporters({ + yargs: argv as CommonDiffArguments, + changes: changes, + }); + console.log('Successfully wrote the report file'); + return Promise.resolve(undefined); + } catch (/* istanbul ignore next */ err) { + /* istanbul ignore next */ + return Promise.reject(err); + } +}; + // default export export default { - command: command, - description: description, - builder: builder, - handler: handler, -}; \ No newline at end of file + command: command, + description: description, + builder: builder, + handler: handler, +}; diff --git a/src/cmds/diff/detectChanges.ts b/src/cmds/diff/detectChanges.ts index 26d67ae..7239888 100644 --- a/src/cmds/diff/detectChanges.ts +++ b/src/cmds/diff/detectChanges.ts @@ -1,12 +1,12 @@ -import { CommonDiffArguments, ChangesOps } from "../../types/diffTypes"; -import type { - ChangeOperations, - CommonChangeOperation, - AddOperation, - DelOperation, - PutOperation -} from "../../types/diffTypes"; -import getLeavesPathes from "../../commons/getLeavesPathes"; +import { CommonDiffArguments, ChangesOps } from '../../types/diffTypes'; +import type { + ChangeOperations, + CommonChangeOperation, + AddOperation, + DelOperation, + PutOperation, +} from '../../types/diffTypes'; +import getLeavesPathes from '../../commons/getLeavesPathes'; // lodash method import get from 'lodash/get'; @@ -15,83 +15,92 @@ import isEqual from 'lodash/isEqual'; import difference from 'lodash/difference'; type fileParam = { - keys: string[], - file: string, - obj: any, -} + keys: string[]; + file: string; + obj: any; +}; // create an "ChangeOperation" function createChangeOperation( - technicalKey: string, - op: ChangesOps, - file1 : fileParam, - file2 : fileParam -) : ChangeOperations { - // common part - let obj : CommonChangeOperation = { - key: technicalKey, - type: op, - from: file1.file, - to: file2.file - }; - // specific parts - if ( [ChangesOps.DEL, ChangesOps.PUT].some(o => o === op) ) { - (obj as DelOperation | PutOperation).oldValue = get(file1.obj, technicalKey); - } - if ( [ChangesOps.ADD, ChangesOps.PUT].some(o => o === op) ) { - (obj as AddOperation | PutOperation).newValue = get(file2.obj, technicalKey); - } - // return result - return obj as ChangeOperations; + technicalKey: string, + op: ChangesOps, + file1: fileParam, + file2: fileParam +): ChangeOperations { + // common part + let obj: CommonChangeOperation = { + key: technicalKey, + type: op, + from: file1.file, + to: file2.file, + }; + // specific parts + if ([ChangesOps.DEL, ChangesOps.PUT].some((o) => o === op)) { + (obj as DelOperation | PutOperation).oldValue = get( + file1.obj, + technicalKey + ); + } + if ([ChangesOps.ADD, ChangesOps.PUT].some((o) => o === op)) { + (obj as AddOperation | PutOperation).newValue = get( + file2.obj, + technicalKey + ); + } + // return result + return obj as ChangeOperations; } // computes changes -export default function detectChanges(argv : CommonDiffArguments) : ChangeOperations[] { - let result : ChangeOperations[] = []; +export default function detectChanges( + argv: CommonDiffArguments +): ChangeOperations[] { + let result: ChangeOperations[] = []; + + // Fetch keys + let files: fileParam[] = argv.files.map((file, idx) => ({ + // like done in backupPaths function + file: `file${idx + 1}`, + // get leaves paths for provided file + keys: getLeavesPathes(file), + // object in order to access properties + obj: file, + })); - // Fetch keys - let files : fileParam[] = argv.files.map( (file, idx) => ({ - // like done in backupPaths function - file: `file${idx + 1}`, - // get leaves paths for provided file - keys: getLeavesPathes(file), - // object in order to access properties - obj: file - })); + // Computes pairs for comparisons + // Given an array with [file1, file2, file3] , it would mean two pairs [file1, file2] & [file2, file3] + let comparaison_pairs = Array.from( + { length: files.length - 1 }, + (_, idx) => idx + ).map((idx) => [files[idx], files[idx + 1]]); - // Computes pairs for comparisons - // Given an array with [file1, file2, file3] , it would mean two pairs [file1, file2] & [file2, file3] - let comparaison_pairs = Array - .from({ length: files.length - 1 }, (_, idx) => idx) - .map(idx => ([ - files[idx], - files[idx + 1] - ])); - - // Made comparisons - for( let [file1, file2] of comparaison_pairs) { + // Made comparisons + for (let [file1, file2] of comparaison_pairs) { + // Computes changes of values + let sameKeys = intersection(file1.keys, file2.keys); + let modifiedKeys = sameKeys.filter( + (key) => !isEqual(get(file1.obj, key), get(file2.obj, key)) + ); - // Computes changes of values - let sameKeys = intersection(file1.keys, file2.keys); - let modifiedKeys = sameKeys - .filter(key => !isEqual( - get(file1.obj, key), - get(file2.obj, key) - )); + result.push( + ...modifiedKeys.map((key) => + createChangeOperation(key, ChangesOps.PUT, file1, file2) + ) + ); - result.push( - ...modifiedKeys.map(key => createChangeOperation(key, ChangesOps.PUT, file1, file2)) - ); + // Computes deleted keys + result.push( + ...difference(file1.keys, file2.keys).map((key) => + createChangeOperation(key, ChangesOps.DEL, file1, file2) + ) + ); - // Computes deleted keys - result.push( - ...difference(file1.keys, file2.keys).map(key => createChangeOperation(key, ChangesOps.DEL, file1, file2)) - ); + // Computes new keys + result.push( + ...difference(file2.keys, file1.keys).map((key) => + createChangeOperation(key, ChangesOps.ADD, file1, file2) + ) + ); + } - // Computes new keys - result.push( - ...difference(file2.keys, file1.keys).map(key => createChangeOperation(key, ChangesOps.ADD, file1, file2)) - ) - } - - return result; -} \ No newline at end of file + return result; +} diff --git a/src/cmds/diff/reporter-strategies/index.ts b/src/cmds/diff/reporter-strategies/index.ts index 0a67b1f..dff128d 100644 --- a/src/cmds/diff/reporter-strategies/index.ts +++ b/src/cmds/diff/reporter-strategies/index.ts @@ -1,7 +1,7 @@ import { DiffExportParameters } from '../../../types/diffTypes'; import toJSON from './toJSON'; -export default async function(params: DiffExportParameters) { +export default async function (params: DiffExportParameters) { switch (params.yargs.outputFormat) { case 'JSON': return toJSON(params); diff --git a/src/cmds/diff/reporter-strategies/toJSON.ts b/src/cmds/diff/reporter-strategies/toJSON.ts index 40265ca..1777dad 100644 --- a/src/cmds/diff/reporter-strategies/toJSON.ts +++ b/src/cmds/diff/reporter-strategies/toJSON.ts @@ -2,7 +2,7 @@ import fs from 'fs'; import path from 'path'; import { DiffExportParameters } from '../../../types/diffTypes'; -export default async function(params: DiffExportParameters) { +export default async function (params: DiffExportParameters) { let filename = path.resolve( params.yargs.outputDir, `${params.yargs.filename}.json` diff --git a/src/cmds/export.ts b/src/cmds/export.ts index 949c65a..2b11aab 100644 --- a/src/cmds/export.ts +++ b/src/cmds/export.ts @@ -6,7 +6,7 @@ import export_csv from './export_cmds/export_csv'; export const command = 'export '; export const description = 'Export i18n files into something else'; -export const builder = function(y: any) { +export const builder = function (y: any) { return ( y // commandDir doesn't work very well in Typescript @@ -15,7 +15,7 @@ export const builder = function(y: any) { ); }; /* istanbul ignore next */ -export const handler = function(_: any) {}; +export const handler = function (_: any) {}; // default export export default { diff --git a/src/cmds/export_cmds/export_commons.ts b/src/cmds/export_cmds/export_commons.ts index c037e53..4f27c68 100644 --- a/src/cmds/export_cmds/export_commons.ts +++ b/src/cmds/export_cmds/export_commons.ts @@ -1,117 +1,153 @@ -import fs, { PathLike } from "fs"; -import path from "path"; +import fs, { PathLike } from 'fs'; +import path from 'path'; // lodash methodes -import groupBy from "lodash/groupBy"; -import flattenDeep from "lodash/flattenDeep"; -import get from "lodash/get"; +import groupBy from 'lodash/groupBy'; +import flattenDeep from 'lodash/flattenDeep'; +import get from 'lodash/get'; // For typings -import type { Argv } from "yargs"; -import { CommonExportArguments, I18N_Merged_Data } from "../../types/exportTypes" -type I18N_Object = { [x: string]: string | Array | I18N_Object } -type I18N_Result = { - "technical_key": string, - "label": string, - "locale": string -}[] +import type { Argv } from 'yargs'; +import { + CommonExportArguments, + I18N_Merged_Data, +} from '../../types/exportTypes'; // middelware -import { parsePathToJSON } from "../../middlewares/middlewares"; -import getLeavesPathes from "../../commons/getLeavesPathes"; - -// configure export commands with the common options in the builder step -export function setUpCommonsOptions(y: Argv) { - return y - .option("files", { - describe: "Absolute path to a JSON object that have as key an unique identifier and value the absolute path to a i18n file, such as : { \"FR\": \"/somePath/fr.json\", \"NL\": \"/somePath/nl.json\"}", - demandOption: true - }) - .option("filename", { - type: "string", - alias: "of", - describe: "Name of the output file generated by this CLI (without extension)" - }) - .option("outputDir", { - type: "string", - alias: "od", - describe: "Output folder where to store the output file", - default: process.cwd() - }) - // default value for filename - .default("filename", function() { - const date = new Date(); - const timestamp = `${date.getDate()}-${date.getMonth() + 1}-${date.getFullYear()} ${date.getHours()}h${date.getMinutes()}m${date.getSeconds()}`; - return `translations_${timestamp}`; - }) - .config('settings', function (configPath) { - return JSON.parse(fs.readFileSync(configPath, 'utf-8')) - }) - // coerce files into Object - .middleware(parsePathToJSON("files"), true) - // coerce path provided by outputDir - .coerce(["outputDir"], path.resolve) -} +import { parsePathToJSON } from '../../middlewares/middlewares'; +import getLeavesPathes from '../../commons/getLeavesPathes'; +type I18N_Object = { [x: string]: string | Array | I18N_Object }; +type I18N_Result = { + technical_key: string; + label: string; + locale: string; +}[]; +// Builder for yargs +export class CommonExportYargsBuilder { + y: Argv<{ [x: string]: any }>; // current yargs result -// turns n i18n file(s) into a merged version -export function merge_i18n_files(argv : CommonExportArguments) : Promise { - return new Promise( (resolve, reject) => { - Promise - // Read files and convert them to useful obj - .all( - Object - .entries(argv.files) - .map(entry => readFile(entry)) - ) - // merge results - .then(results => mergeResults(results)) - .then(data => resolve(data)) - .catch(/* istanbul ignore next */ err => reject(err)); + constructor(y: Argv<{ [x: string]: any }>) { + this.y = y; + } + + addFilesOption() { + this.y = this.y + .option('files', { + describe: + 'Absolute path to a JSON object that have as key an unique identifier and value the absolute path to a i18n file, such as : { "FR": "/somePath/fr.json", "NL": "/somePath/nl.json"}', + demandOption: true, + }) + // coerce files into Object + .middleware(parsePathToJSON('files'), true); + return this; + } + + addFilenameOption() { + this.y = this.y + .option('filename', { + type: 'string', + alias: 'of', + describe: + 'Name of the output file generated by this CLI (without extension)', + }) + // default value for filename + .default('filename', function () { + const date = new Date(); + const timestamp = `${date.getDate()}-${ + date.getMonth() + 1 + }-${date.getFullYear()} ${date.getHours()}h${date.getMinutes()}m${date.getSeconds()}`; + return `translations_${timestamp}`; + }); + return this; + } + + addOutputDirOption() { + this.y = this.y + .option('outputDir', { + type: 'string', + alias: 'od', + describe: 'Output folder where to store the output file', + default: process.cwd(), + }) + // coerce path provided by outputDir + .coerce(['outputDir'], path.resolve); + return this; + } + + addSettingConfig() { + this.y = this.y.config('settings', function (configPath) { + let ext = path.extname(configPath); + return /\.js$/i.test(ext) + ? require(configPath) + : JSON.parse(fs.readFileSync(configPath, 'utf-8')); }); + return this; + } + + build() { + return this.y; + } +} + +// turns n i18n file(s) into a merged version +export function merge_i18n_files( + argv: CommonExportArguments +): Promise { + return new Promise((resolve, reject) => { + Promise + // Read files and convert them to useful obj + .all(Object.entries(argv.files).map((entry) => readFile(entry))) + // merge results + .then((results) => mergeResults(results)) + .then((data) => resolve(data)) + .catch(/* istanbul ignore next */ (err) => reject(err)); + }); } // merge_i18n_files sub functions // read file and turning into a useful array of objects -function readFile([locale, file_path] : [string, PathLike]) : Promise { - return new Promise((resolve, reject) => { - fs.promises.readFile(file_path, 'utf8') - .then(jsonData => Promise.resolve(JSON.parse(jsonData))) - .then(json => i18n_to_result_format(json, locale)) - .then(result => resolve(result)) - .catch(/* istanbul ignore next */ err => reject(err)); - }); +function readFile([locale, file_path]: [ + string, + PathLike +]): Promise { + return new Promise((resolve, reject) => { + fs.promises + .readFile(file_path, 'utf8') + .then((jsonData) => Promise.resolve(JSON.parse(jsonData))) + .then((json) => i18n_to_result_format(json, locale)) + .then((result) => resolve(result)) + .catch(/* istanbul ignore next */ (err) => reject(err)); + }); } // turns i18n object to usable format -function i18n_to_result_format(obj : I18N_Object, locale: string) : I18N_Result { - let leafPaths = getLeavesPathes(obj); - return leafPaths.map(leafPath => ({ - locale: locale, - technical_key: leafPath, - label: get(obj, leafPath) as string - })); +function i18n_to_result_format(obj: I18N_Object, locale: string): I18N_Result { + let leafPaths = getLeavesPathes(obj); + return leafPaths.map((leafPath) => ({ + locale: locale, + technical_key: leafPath, + label: get(obj, leafPath) as string, + })); } // merge array of {"technical_key": "...", "label": "...", "locale": "..."} // into {"technical_key": ..., "labels": { "FR": ..., "NL": ..., "DE": ... }} -function mergeResults(results : I18N_Result[]) : Promise { - const flattenResults = flattenDeep(results); - let groupBy_technical_key = groupBy(flattenResults, 'technical_key'); - - let final_result = Object - .keys(groupBy_technical_key) - .sort() - .map(key => { - return { - "technical_key": key, - "labels": groupBy_technical_key[key] - .reduce( (prev : any, curr : any) => { - prev[curr["locale"]] = curr["label"]; - return prev; - }, {}) - } - }); - return Promise.resolve(final_result); -} \ No newline at end of file +function mergeResults(results: I18N_Result[]): Promise { + const flattenResults = flattenDeep(results); + let groupBy_technical_key = groupBy(flattenResults, 'technical_key'); + + let final_result = Object.keys(groupBy_technical_key) + .sort() + .map((key) => { + return { + technical_key: key, + labels: groupBy_technical_key[key].reduce((prev: any, curr: any) => { + prev[curr['locale']] = curr['label']; + return prev; + }, {}), + }; + }); + return Promise.resolve(final_result); +} diff --git a/src/cmds/export_cmds/export_csv.ts b/src/cmds/export_cmds/export_csv.ts index 345243a..627dd57 100644 --- a/src/cmds/export_cmds/export_csv.ts +++ b/src/cmds/export_cmds/export_csv.ts @@ -3,7 +3,7 @@ import path from 'path'; import Excel from 'exceljs'; // common fct -import { merge_i18n_files, setUpCommonsOptions } from './export_commons'; +import { merge_i18n_files, CommonExportYargsBuilder } from './export_commons'; import { parsePathToJSON } from '../../middlewares/middlewares'; // checks import @@ -21,54 +21,98 @@ const CHECKS = [...EXPORT_CHECKS.CHECKS, ...EXPORT_CHECKS.CSV.CHECKS]; export const command = 'to_csv'; export const description = 'Export i18n files into a csv file'; -export const builder = function(y: Argv) { - return ( - setUpCommonsOptions(y) // set up common options for export +// Builder for yargs +export class CsvExportYargsBuilder extends CommonExportYargsBuilder { + addColumnsOption() { + this.y = this.y .option('columns', { description: 'Absolute path to a JSON array of objects, to control the columns. Example : [{ "locale": "FR", "label": "French translation" }]', demandOption: true, }) - .option('delimiter', { - description: 'Specify an field delimiter such as | or \\t', - choices: [',', ';', '\t', ' ', '|'], - default: ';', - }) - .option('rowDelimiter', { - description: 'Specify an alternate row delimiter (i.e \\r\\n)', - type: 'string', - default: '\n', - }) - .option('quote', { - description: 'String to quote fields that contain a delimiter', - type: 'string', - default: '"', - }) - .option('escape', { - description: - 'The character to use when escaping a value that is quoted and contains a quote character that is not the end of the field', - type: 'string', - default: '"', - }) - .option('writeBOM', { - description: - 'Set to true if you want the first character written to the stream to be a utf-8 BOM character.', - type: 'boolean', - default: false, - }) - .option('quoteHeaders', { - description: 'If true then all headers will be quoted', - type: 'boolean', - default: true, - }) // coerce columns into Object - .middleware(parsePathToJSON('columns'), true) + .middleware(parsePathToJSON('columns'), true); + return this; + } + + addDelimiterOption() { + this.y = this.y.option('delimiter', { + description: 'Specify an field delimiter such as | or \\t', + choices: [',', ';', '\t', ' ', '|'], + default: ';', + }); + return this; + } + + addRowDelimiterOption() { + this.y = this.y.option('rowDelimiter', { + description: 'Specify an alternate row delimiter (i.e \\r\\n)', + type: 'string', + default: '\n', + }); + return this; + } + + addQuoteOption() { + this.y = this.y.option('quote', { + description: 'String to quote fields that contain a delimiter', + type: 'string', + default: '"', + }); + return this; + } + + addEscapeOption() { + this.y = this.y.option('escape', { + description: + 'The character to use when escaping a value that is quoted and contains a quote character that is not the end of the field', + type: 'string', + default: '"', + }); + return this; + } + + addWriteBOMOption() { + this.y = this.y.option('writeBOM', { + description: + 'Set to true if you want the first character written to the stream to be a utf-8 BOM character.', + type: 'boolean', + default: false, + }); + return this; + } + + addQuoteHeadersOption() { + this.y = this.y.option('quoteHeaders', { + description: 'If true then all headers will be quoted', + type: 'boolean', + default: true, + }); + return this; + } +} + +export const builder = function (y: Argv) { + return ( + new CsvExportYargsBuilder(y) + .addFilesOption() + .addFilenameOption() + .addOutputDirOption() + .addSettingConfig() + .addColumnsOption() + .addDelimiterOption() + .addRowDelimiterOption() + .addQuoteOption() + .addEscapeOption() + .addWriteBOMOption() + .addQuoteHeadersOption() + .build() // validations .check(resolveChecksInOrder(CHECKS)) ); }; -export const handler = async function(argv: CSVExportArguments) { +export const handler = async function (argv: CSVExportArguments) { try { let data: I18N_Merged_Data = await merge_i18n_files(argv); const CSV_FILE = path.resolve(argv.outputDir, argv.filename + '.csv'); @@ -104,7 +148,7 @@ async function export_as_csv( // workaround as Exceljs doesn't support nested key worksheet.addRows( - data.map(item => + data.map((item) => argv.columns.reduce( (acc: { [x: string]: string }, { locale }) => { acc[`labels.${locale}`] = item['labels'][locale] || ''; diff --git a/src/cmds/export_cmds/export_xlsx.ts b/src/cmds/export_cmds/export_xlsx.ts index 5a63c73..afa7546 100644 --- a/src/cmds/export_cmds/export_xlsx.ts +++ b/src/cmds/export_cmds/export_xlsx.ts @@ -1,111 +1,146 @@ // for fs ops -import path from "path"; +import path from 'path'; import Excel from 'exceljs'; - -// lodash methodes -import isFunction from "lodash/isFunction"; +// reuse exceljs Worksheet type +import { Worksheet } from 'exceljs'; // common fct -import { merge_i18n_files, setUpCommonsOptions } from "./export_commons"; -import { parsePathToJSON } from "../../middlewares/middlewares"; +import { merge_i18n_files, CommonExportYargsBuilder } from './export_commons'; +import { + parsePathToJSON, + parsePathToFunction, +} from '../../middlewares/middlewares'; // checks import -import { - resolveChecksInOrder, - EXPORT_CHECKS -} from "../../checks/index"; +import { resolveChecksInOrder, EXPORT_CHECKS } from '../../checks/index'; // For typing // eslint-disable-next-line import type { Argv } from "yargs"; -import { XLSXExportArguments, I18N_Merged_Data } from "../../types/exportTypes"; +import { XLSXExportArguments, I18N_Merged_Data } from '../../types/exportTypes'; // checks for this command const CHECKS = [...EXPORT_CHECKS.CHECKS, ...EXPORT_CHECKS.XLSX.CHECKS]; // named exports -export const command = "to_xlsx"; -export const description = "Export i18n files into a xlsx file, created by exceljs"; - -export const builder = function (y : Argv) { - return setUpCommonsOptions(y) // set up common options for export - .option("columns", { - description: "Absolute path to a JSON array of objects, to control the columns. Example : [{ \"locale\": \"FR\", \"label\": \"French translation\" }]", - demandOption: true - }) - .option("worksheetName", { - type: "string", - description: "Name of the worksheet", - default: "Translations" - }) - .option("worksheetCustomizer", { - type: "string", - description: "Absolute path to a JS module to customize the generated xlsx, thanks to exceljs. This js file exports a default async function with the following signature : (worksheet : Excel.Worksheet) => Promise" - }) - // coerce columns into Object - .middleware(parsePathToJSON("columns"), true) - // validations - .check(resolveChecksInOrder(CHECKS)) +export const command = 'to_xlsx'; +export const description = + 'Export i18n files into a xlsx file, created by exceljs'; + +// Builder for yargs +export class XlsxExportYargsBuilder extends CommonExportYargsBuilder { + addColumnsOption() { + this.y = this.y + .option('columns', { + description: + 'Absolute path to a JSON array of objects, to control the columns. Example : [{ "locale": "FR", "label": "French translation" }]', + demandOption: true, + }) + // coerce columns into Object + .middleware(parsePathToJSON('columns'), true); + return this; + } + + addWorksheetCustomizerOption() { + this.y = this.y + .option('worksheetCustomizer', { + description: + 'Absolute path to a JS module to customize the generated xlsx, thanks to exceljs. This js file exports a default async function with the following signature : (worksheet : Excel.Worksheet) => Promise', + }) + // coerce worksheetCustomizer into function + .middleware(parsePathToFunction('worksheetCustomizer'), true); + return this; + } + + addWorksheetNameOption() { + this.y = this.y.option('worksheetName', { + type: 'string', + description: 'Name of the worksheet', + default: 'Translations', + }); + return this; + } } -export const handler = async function (argv : XLSXExportArguments) { - try { - let data : I18N_Merged_Data = await merge_i18n_files(argv); - const XLSX_FILE = path.resolve(argv.outputDir, argv.filename + ".xlsx"); - await export_as_excel(XLSX_FILE, argv, data); - console.log(`${XLSX_FILE} successfully written`); - return Promise.resolve(undefined); - } catch(/* istanbul ignore next */ err) { - return Promise.reject(err); - } +export const builder = function (y: Argv) { + return ( + new XlsxExportYargsBuilder(y) + .addFilesOption() + .addFilenameOption() + .addOutputDirOption() + .addSettingConfig() + .addColumnsOption() + .addWorksheetCustomizerOption() + .addWorksheetNameOption() + .build() + // validations + .check(resolveChecksInOrder(CHECKS)) + ); }; -// write -async function export_as_excel(XLSX_FILE : string, argv : XLSXExportArguments, data : I18N_Merged_Data) { +export const handler = async function (argv: XLSXExportArguments) { + try { + let data: I18N_Merged_Data = await merge_i18n_files(argv); + const XLSX_FILE = path.resolve(argv.outputDir, argv.filename + '.xlsx'); + await export_as_excel(XLSX_FILE, argv, data); + console.log(`${XLSX_FILE} successfully written`); + return Promise.resolve(undefined); + } catch (/* istanbul ignore next */ err) { + return Promise.reject(err); + } +}; + +// write +async function export_as_excel( + XLSX_FILE: string, + argv: XLSXExportArguments, + data: I18N_Merged_Data +) { + console.log('Preparing XLSX file ...'); - console.log("Preparing XLSX file ..."); + // prepare data + const workbook = new Excel.Workbook(); + let worksheet = workbook.addWorksheet(argv.worksheetName); - // prepare data - const workbook = new Excel.Workbook(); - let worksheet = workbook.addWorksheet(argv.worksheetName); + // Set up columns + worksheet.columns = [ + { header: 'Technical Key', key: 'technical_key' }, + ].concat( + argv.columns.map(({ label, locale }) => ({ + header: label, + key: `labels.${locale}`, + })) + ); - // Set up columns - worksheet.columns = [ - {header: "Technical Key", key: "technical_key"} - ].concat( - argv.columns - .map( ({label, locale}) => ({header: label, key: `labels.${locale}`}) ) + // workaround as Exceljs doesn't support nested key + worksheet.addRows( + data.map((item) => + argv.columns.reduce( + (acc: { [x: string]: string }, { locale }) => { + acc[`labels.${locale}`] = item['labels'][locale] || ''; + return acc; + }, + { technical_key: item['technical_key'] } + ) ) + ); - // workaround as Exceljs doesn't support nested key - worksheet.addRows( - data.map(item => argv.columns - .reduce( (acc : { [x: string]: string}, {locale}) => { - acc[`labels.${locale}`] = item["labels"][locale] || ''; - return acc; - }, { "technical_key": item["technical_key"] }) - ) - ); - - // If worksheetCustomizer was set, give user total control on worksheet output - if (argv.worksheetCustomizer) { - let newWorksheetFct = require(argv.worksheetCustomizer); - if (isFunction(newWorksheetFct) && newWorksheetFct.length === 1) { - console.log("Applying worksheetCustomizer ..."); - worksheet = await newWorksheetFct(worksheet) - } else { - return Promise.reject(new Error("worksheetCustomizer is not an function or doesn't take an single argument")); - } - } - - // finally write this file - return workbook.xlsx.writeFile(XLSX_FILE); + // If worksheetCustomizer was set, give user total control on worksheet output + if (argv.worksheetCustomizer) { + console.log('Applying worksheetCustomizer ...'); + worksheet = await ( + argv.worksheetCustomizer as (x: Worksheet) => Promise + )(worksheet); + } + + // finally write this file + return workbook.xlsx.writeFile(XLSX_FILE); } // default export export default { - command : command, - description : description, - builder : builder, - handler: handler -} \ No newline at end of file + command: command, + description: description, + builder: builder, + handler: handler, +}; diff --git a/src/cmds/import.ts b/src/cmds/import.ts index e74dc98..7da01b7 100644 --- a/src/cmds/import.ts +++ b/src/cmds/import.ts @@ -6,7 +6,7 @@ import import_csv from './import_cmds/import_csv'; export const command = 'import '; export const description = 'Turn a file to i18n file(s)'; -export const builder = function(y: any) { +export const builder = function (y: any) { return ( y // commandDir doesn't work very well in Typescript @@ -16,7 +16,7 @@ export const builder = function(y: any) { }; /* istanbul ignore next */ -export const handler = function(_: any) {}; +export const handler = function (_: any) {}; // default export export default { diff --git a/src/cmds/import_cmds/import_commons.ts b/src/cmds/import_cmds/import_commons.ts index 0bc1fc6..b2788f4 100644 --- a/src/cmds/import_cmds/import_commons.ts +++ b/src/cmds/import_cmds/import_commons.ts @@ -1,92 +1,141 @@ -import fs from "fs"; -import path from "path"; +import fs from 'fs'; +import path from 'path'; // lodash methodes -import set from "lodash/set"; -import groupBy from "lodash/groupBy"; +import set from 'lodash/set'; +import groupBy from 'lodash/groupBy'; // For typings -import type { Argv } from "yargs"; -import { CommonImportArguments, extractedTranslation } from "../../types/importTypes"; +import type { Argv } from 'yargs'; +import { + CommonImportArguments, + extractedTranslation, +} from '../../types/importTypes'; -// configure import commands with the common options in the builder step -export function setUpCommonsOptions(y: Argv) { - return y - .options("input", { - type: "string", - describe: "Absolute path to a file that will be used as source to generate i18n file(s)", - demandOption: true - }) - .option("outputDir", { - type: "string", - alias: "od", - describe: "Output folder where to store the output file(s)", - default: process.cwd() - }) - .options("locales", { - type: "array", - describe: "Array of locales (such as [\"FR\", \"NL\"]) that will be used to generate i18n file(s)", - demandOption: true - }) - .option("suffix", { - type: "string", - describe: "Suffix to append in the output filename(s) to distinguish executions of this script. Use an empty string if you don't want this behavior" - }) - .default("suffix", function() { - const date = new Date(); - const timestamp = `${date.getDate()}-${date.getMonth() + 1}-${date.getFullYear()} ${date.getHours()}h${date.getMinutes()}m${date.getSeconds()}`; - return `_${timestamp}`; - }) - .config('settings', function (configPath) { - return JSON.parse(fs.readFileSync(configPath, 'utf-8')) - }) - // coerce path provided by outputDir - .coerce(["outputDir"], path.resolve) +// Builder for yargs +export class CommonImporttYargsBuilder { + y: Argv<{ [x: string]: any }>; // current yargs result + + constructor(y: Argv<{ [x: string]: any }>) { + this.y = y; + } + + addInputOption() { + this.y = this.y.options('input', { + type: 'string', + describe: + 'Absolute path to a file that will be used as source to generate i18n file(s)', + demandOption: true, + }); + return this; + } + + addOutputDir() { + this.y = this.y + .option('outputDir', { + type: 'string', + alias: 'od', + describe: 'Output folder where to store the output file(s)', + default: process.cwd(), + }) + // coerce path provided by outputDir + .coerce(['outputDir'], path.resolve); + return this; + } + + addSettingConfig() { + this.y = this.y.config('settings', function (configPath) { + let ext = path.extname(configPath); + return /\.js$/i.test(ext) + ? require(configPath) + : JSON.parse(fs.readFileSync(configPath, 'utf-8')); + }); + return this; + } + + addLocalesOption() { + this.y = this.y.options('locales', { + type: 'array', + describe: + 'Array of locales (such as ["FR", "NL"]) that will be used to generate i18n file(s)', + demandOption: true, + }); + return this; + } + + addSuffixOption() { + this.y = this.y + .option('suffix', { + type: 'string', + describe: + "Suffix to append in the output filename(s) to distinguish executions of this script. Use an empty string if you don't want this behavior", + }) + .default('suffix', function () { + const date = new Date(); + const timestamp = `${date.getDate()}-${ + date.getMonth() + 1 + }-${date.getFullYear()} ${date.getHours()}h${date.getMinutes()}m${date.getSeconds()}`; + return `_${timestamp}`; + }); + return this; + } + + build() { + return this.y; + } } // generate filepaths for locales -export function generate_i18n_filepaths(argv : CommonImportArguments) { - return argv.locales.reduce( (acc : { [x: string] : string }, locale : string) => { - acc[locale] = path.resolve( - argv.outputDir, - `${locale.toLowerCase()}${argv.suffix}.json` - ); - return acc; - }, {}); +export function generate_i18n_filepaths(argv: CommonImportArguments) { + return argv.locales.reduce((acc: { [x: string]: string }, locale: string) => { + acc[locale] = path.resolve( + argv.outputDir, + `${locale.toLowerCase()}${argv.suffix}.json` + ); + return acc; + }, {}); } // extractedTranslation[] to i18n file(s) -export function extractedTranslations_to_i18n_files(files: {[x: string] : string}, translations : extractedTranslation[]) { - let groupBy_locales = groupBy(translations, "locale"); - return Promise.all( - Object - .entries(groupBy_locales) - .map( ([locale, translations]) => write_new_i18n_file( - locale, - files[locale], - translations_2_i18n_object(translations)) - ) +export function extractedTranslations_to_i18n_files( + files: { [x: string]: string }, + translations: extractedTranslation[] +) { + let groupBy_locales = groupBy(translations, 'locale'); + return Promise.all( + Object.entries(groupBy_locales).map(([locale, translations]) => + write_new_i18n_file( + locale, + files[locale], + translations_2_i18n_object(translations) + ) ) + ); } // export result for a given language into the given file -function write_new_i18n_file(locale : string, filepath : string, json : { [x: string]: any } ) { - console.log(`\t Trying to write ${locale} i18n file at ${filepath}`) - return new Promise((resolve, reject) => { - fs.promises.writeFile(filepath, JSON.stringify(json, null, 4)) - .then(_ => { - console.log(`\t Successfully wrote ${locale} i18n file`); - resolve(undefined); - }) - .catch(err => reject(err)) - }); +function write_new_i18n_file( + locale: string, + filepath: string, + json: { [x: string]: any } +) { + console.log(`\t Trying to write ${locale} i18n file at ${filepath}`); + return new Promise((resolve, reject) => { + fs.promises + .writeFile(filepath, JSON.stringify(json, null, 4)) + .then((_) => { + console.log(`\t Successfully wrote ${locale} i18n file`); + resolve(undefined); + }) + .catch((err) => reject(err)); + }); } // Turns array for a given lang into a i18n js object -function translations_2_i18n_object(translations : extractedTranslation[]) { - let result = {}; - translations.forEach(item => { - set(result, item["technical_key"], item["label"]) - }); - return result; -} \ No newline at end of file +function translations_2_i18n_object(translations: extractedTranslation[]) { + let result = {}; + translations.forEach((item) => { + set(result, item['technical_key'], item['label']); + }); + return result; +} diff --git a/src/cmds/import_cmds/import_csv.ts b/src/cmds/import_cmds/import_csv.ts index 50c8300..a665b3e 100644 --- a/src/cmds/import_cmds/import_csv.ts +++ b/src/cmds/import_cmds/import_csv.ts @@ -1,141 +1,187 @@ import Excel from 'exceljs'; // common fct -import { setUpCommonsOptions, generate_i18n_filepaths, extractedTranslations_to_i18n_files } from "./import_commons"; -import { parsePathToJSON } from "../../middlewares/middlewares"; +import { + CommonImporttYargsBuilder, + generate_i18n_filepaths, + extractedTranslations_to_i18n_files, +} from './import_commons'; +import { parsePathToJSON } from '../../middlewares/middlewares'; // lodash methods -import flattenDeep from "lodash/flattenDeep"; +import flattenDeep from 'lodash/flattenDeep'; // checks import -import { - resolveChecksInOrder, - IMPORT_CHECKS -} from "../../checks/index"; +import { resolveChecksInOrder, IMPORT_CHECKS } from '../../checks/index'; // For typing // eslint-disable-next-line import type { Argv } from "yargs"; -import { CSVImportArguments } from "../../types/importTypes"; +import { CSVImportArguments } from '../../types/importTypes'; // checks for this command const CHECKS = [...IMPORT_CHECKS.CHECKS, ...IMPORT_CHECKS.CSV.CHECKS]; // named exports -export const command = "from_csv"; -export const description = "Turn a csv file to i18n file(s)"; - -export const builder = function (y : Argv) { - return setUpCommonsOptions(y) // set up common options for import - .options("columns", { - describe: "Absolute path to a JSON object that describe headers of the excel columns used to store translations", - demandOption: true - }) - .option('delimiter', { - description: 'Specify an field delimiter such as | or \\t', - choices: [',', ';', '\t', ' ', '|'], - default: ';', - }) - .option('quote', { - description: 'String used to quote fields that contain a delimiter', - type: 'string', - default: '"', - }) - .option('escape', { - description: - 'The character used when escaping a value that is quoted and contains a quote character that is not the end of the field', - type: 'string', - default: '"', - }) - .option('encoding', { - description: "Input file encoding", - choices: ['utf8', 'utf16le', 'latin1'], - default: 'utf8' - }) - // coerce columns into Object - .middleware(parsePathToJSON("columns"), true) - // validations - .check(resolveChecksInOrder(CHECKS)) +export const command = 'from_csv'; +export const description = 'Turn a csv file to i18n file(s)'; + +export class CsvImportYargsBuilder extends CommonImporttYargsBuilder { + addColumnsOption() { + this.y = this.y + .options('columns', { + describe: + 'Absolute path to a JSON object that describe headers of the excel columns used to store translations', + demandOption: true, + }) + // coerce columns into Object + .middleware(parsePathToJSON('columns'), true); + return this; + } + + addDelimiterOption() { + this.y = this.y.option('delimiter', { + description: 'Specify an field delimiter such as | or \\t', + choices: [',', ';', '\t', ' ', '|'], + default: ';', + }); + return this; + } + + addQuoteOption() { + this.y = this.y.option('quote', { + description: 'String used to quote fields that contain a delimiter', + type: 'string', + default: '"', + }); + return this; + } + + addEscapeOption() { + this.y = this.y.option('escape', { + description: + 'The character used when escaping a value that is quoted and contains a quote character that is not the end of the field', + type: 'string', + default: '"', + }); + return this; + } + + addEncodingOption() { + this.y = this.y.option('encoding', { + description: 'Input file encoding', + choices: ['utf8', 'utf16le', 'latin1'], + default: 'utf8', + }); + return this; + } } -export const handler = async function (argv : CSVImportArguments) { - try { - const translations = await csv_2_translation_objects(argv); - const files = generate_i18n_filepaths(argv); - await extractedTranslations_to_i18n_files(files, translations); - console.log("Successfully exported found locale(s) to i18n json file(s)"); - return Promise.resolve(undefined); - } catch (error) { - return Promise.reject(error); - } -} +export const builder = function (y: Argv) { + return ( + new CsvImportYargsBuilder(y) + .addInputOption() + .addLocalesOption() + .addOutputDir() + .addSuffixOption() + .addColumnsOption() + .addDelimiterOption() + .addQuoteOption() + .addEscapeOption() + .addEncodingOption() + .addSettingConfig() + .build() + // validations + .check(resolveChecksInOrder(CHECKS)) + ); +}; + +export const handler = async function (argv: CSVImportArguments) { + try { + const translations = await csv_2_translation_objects(argv); + const files = generate_i18n_filepaths(argv); + await extractedTranslations_to_i18n_files(files, translations); + console.log('Successfully exported found locale(s) to i18n json file(s)'); + return Promise.resolve(undefined); + } catch (error) { + return Promise.reject(error); + } +}; // Extract translations from csv file -async function csv_2_translation_objects(argv : CSVImportArguments) { - const options = { - // https://c2fo.io/fast-csv/docs/parsing/options - parserOptions: { - delimiter: argv.delimiter, - quote: argv.quote, - escape: argv.escape, - encoding: argv.encoding - } - }; - const workbook = new Excel.Workbook(); - const worksheet = await workbook.csv.readFile(argv.input, options); - let rowCount = worksheet.rowCount; - - // columns properties to load - let columns = argv.columns; - - // retrieve the headers of the table - // Warning : Exceljs put for some reason a undefined value at the 0 index - let headers = worksheet.getRow(1).values as (undefined | string)[]; - // retrieve data of the table - let data = (worksheet.getRows(2, rowCount-1) || /* istanbul ignore next */ []).map(item => item.values); - - // find out where the technical key is - const technical_key_index = headers.findIndex(h => (h || '').includes(columns.technical_key)); - - if (technical_key_index === -1) { - return Promise.reject(new Error("Couldn't find index for technical_key with provided label")); - } - - // find out where the translations are positioned in the value - const locales_index = Object - .entries(columns.locales) - .map( ([key, value]) => ({ [key]: headers.findIndex(h => (h || '').includes(value)) })) - .reduce( (prev, curr) => Object.assign(prev, curr), {}) - - // Warn users if some locale translations couldn't be found - let missing_indexes = Object - .entries(locales_index) - .filter( ([_, idx]) => idx === -1); - - for(let [locale, ] of missing_indexes) { - /* istanbul ignore next Not worthy to create a test case for that*/ - console.warn(`Couldn't find index for ${locale} locale with provided label`) - } - - // build results - let results = data.map( - (row : any) => Object - .entries(locales_index) - // skip translation(s) where index couldn't be found - .filter( ([_, idx]) => idx !== -1) - .map( ([locale, localeIndex]) => ({ - "technical_key": row[technical_key_index], - "label": row[localeIndex], - "locale": locale - })) - ) - return Promise.resolve(flattenDeep(results)); +async function csv_2_translation_objects(argv: CSVImportArguments) { + const options = { + // https://c2fo.io/fast-csv/docs/parsing/options + parserOptions: { + delimiter: argv.delimiter, + quote: argv.quote, + escape: argv.escape, + encoding: argv.encoding, + }, + }; + const workbook = new Excel.Workbook(); + const worksheet = await workbook.csv.readFile(argv.input, options); + let rowCount = worksheet.rowCount; + + // columns properties to load + let columns = argv.columns; + + // retrieve the headers of the table + // Warning : Exceljs put for some reason a undefined value at the 0 index + let headers = worksheet.getRow(1).values as (undefined | string)[]; + // retrieve data of the table + let data = ( + worksheet.getRows(2, rowCount - 1) || /* istanbul ignore next */ [] + ).map((item) => item.values); + + // find out where the technical key is + const technical_key_index = headers.findIndex((h) => + (h || '').includes(columns.technical_key) + ); + + if (technical_key_index === -1) { + return Promise.reject( + new Error("Couldn't find index for technical_key with provided label") + ); + } + + // find out where the translations are positioned in the value + const locales_index = Object.entries(columns.locales) + .map(([key, value]) => ({ + [key]: headers.findIndex((h) => (h || '').includes(value)), + })) + .reduce((prev, curr) => Object.assign(prev, curr), {}); + + // Warn users if some locale translations couldn't be found + let missing_indexes = Object.entries(locales_index).filter( + ([_, idx]) => idx === -1 + ); + + for (let [locale] of missing_indexes) { + /* istanbul ignore next Not worthy to create a test case for that*/ + console.warn( + `Couldn't find index for ${locale} locale with provided label` + ); + } + + // build results + let results = data.map((row: any) => + Object.entries(locales_index) + // skip translation(s) where index couldn't be found + .filter(([_, idx]) => idx !== -1) + .map(([locale, localeIndex]) => ({ + technical_key: row[technical_key_index], + label: row[localeIndex], + locale: locale, + })) + ); + return Promise.resolve(flattenDeep(results)); } // default export export default { - command : command, - description: description, - builder : builder, - handler: handler -} \ No newline at end of file + command: command, + description: description, + builder: builder, + handler: handler, +}; diff --git a/src/cmds/import_cmds/import_xlsx.ts b/src/cmds/import_cmds/import_xlsx.ts index 25ccd48..fb48afb 100644 --- a/src/cmds/import_cmds/import_xlsx.ts +++ b/src/cmds/import_cmds/import_xlsx.ts @@ -1,115 +1,139 @@ import Excel from 'exceljs'; // common fct -import { setUpCommonsOptions, generate_i18n_filepaths, extractedTranslations_to_i18n_files } from "./import_commons"; -import { parsePathToJSON } from "../../middlewares/middlewares"; +import { + CommonImporttYargsBuilder, + generate_i18n_filepaths, + extractedTranslations_to_i18n_files, +} from './import_commons'; +import { parsePathToJSON } from '../../middlewares/middlewares'; // lodash methods -import flattenDeep from "lodash/flattenDeep"; +import flattenDeep from 'lodash/flattenDeep'; // checks import -import { - resolveChecksInOrder, - IMPORT_CHECKS -} from "../../checks/index"; +import { resolveChecksInOrder, IMPORT_CHECKS } from '../../checks/index'; // For typing // eslint-disable-next-line import type { Argv } from "yargs"; -import { XLSXImportArguments } from "../../types/importTypes"; +import { XLSXImportArguments } from '../../types/importTypes'; // checks for this command const CHECKS = [...IMPORT_CHECKS.CHECKS, ...IMPORT_CHECKS.XLSX.CHECKS]; // named exports -export const command = "from_xlsx"; -export const description = "Turn a xlsx file to i18n file(s)"; - -export const builder = function (y : Argv) { - return setUpCommonsOptions(y) // set up common options for import - .options("columns", { - describe: "Absolute path to a JSON object that describe headers of the excel columns used to store translations", - demandOption: true - }) - // coerce columns into Object - .middleware(parsePathToJSON("columns"), true) - // validations - .check(resolveChecksInOrder(CHECKS)) +export const command = 'from_xlsx'; +export const description = 'Turn a xlsx file to i18n file(s)'; + +export class XlsxImportYargsBuilder extends CommonImporttYargsBuilder { + addColumnsOption() { + this.y = this.y + .options('columns', { + describe: + 'Absolute path to a JSON object that describe headers of the excel columns used to store translations', + demandOption: true, + }) + // coerce columns into Object + .middleware(parsePathToJSON('columns'), true); + return this; + } } -export const handler = async function (argv : XLSXImportArguments) { - try { - const translations = await xlsx_2_translation_objects(argv); - const files = generate_i18n_filepaths(argv); - await extractedTranslations_to_i18n_files(files, translations); - console.log("Successfully exported found locale(s) to i18n json file(s)"); - return Promise.resolve(undefined); - } catch (error) { - return Promise.reject(error); - } -} +export const builder = function (y: Argv) { + return ( + new XlsxImportYargsBuilder(y) + .addInputOption() + .addLocalesOption() + .addOutputDir() + .addSuffixOption() + .addColumnsOption() + .addSettingConfig() + .build() + // validations + .check(resolveChecksInOrder(CHECKS)) + ); +}; + +export const handler = async function (argv: XLSXImportArguments) { + try { + const translations = await xlsx_2_translation_objects(argv); + const files = generate_i18n_filepaths(argv); + await extractedTranslations_to_i18n_files(files, translations); + console.log('Successfully exported found locale(s) to i18n json file(s)'); + return Promise.resolve(undefined); + } catch (error) { + return Promise.reject(error); + } +}; // Extract translations from xlsx file -async function xlsx_2_translation_objects(argv : XLSXImportArguments) { - let workbook = await new Excel.Workbook() - .xlsx - .readFile(argv.input); - - // columns properties to load - let columns = argv.columns; - - // The file generated by export to_xlsx has a single worksheet & I only care on - let worksheet = workbook.worksheets[0]; - let rowCount = worksheet.rowCount; - - // retrieve the headers of the table - // Warning : Exceljs put for some reason a undefined value at the 0 index - let headers = worksheet.getRow(1).values as (undefined | string)[]; - // retrieve data of the table - let data = (worksheet.getRows(2, rowCount-1) || /* istanbul ignore next */ []).map(item => item.values); - - // find out where the technical key is - const technical_key_index = headers.findIndex(h => (h || '').includes(columns.technical_key)); - - if (technical_key_index === -1) { - return Promise.reject(new Error("Couldn't find index for technical_key with provided label")); - } - - // find out where the translations are positioned in the value - const locales_index = Object - .entries(columns.locales) - .map( ([key, value]) => ({ [key]: headers.findIndex(h => (h || '').includes(value)) })) - .reduce( (prev, curr) => Object.assign(prev, curr), {}) - - // Warn users if some locale translations couldn't be found - let missing_indexes = Object - .entries(locales_index) - .filter( ([_, idx]) => idx === -1); - - for(let [locale, ] of missing_indexes) { - /* istanbul ignore next Not worthy to create a test case for that*/ - console.warn(`Couldn't find index for ${locale} locale with provided label`) - } - - // build results - let results = data.map( - (row : any) => Object - .entries(locales_index) - // skip translation(s) where index couldn't be found - .filter( ([_, idx]) => idx !== -1) - .map( ([locale, localeIndex]) => ({ - "technical_key": row[technical_key_index], - "label": row[localeIndex], - "locale": locale - })) - ) - return Promise.resolve(flattenDeep(results)); +async function xlsx_2_translation_objects(argv: XLSXImportArguments) { + let workbook = await new Excel.Workbook().xlsx.readFile(argv.input); + + // columns properties to load + let columns = argv.columns; + + // The file generated by export to_xlsx has a single worksheet & I only care on + let worksheet = workbook.worksheets[0]; + let rowCount = worksheet.rowCount; + + // retrieve the headers of the table + // Warning : Exceljs put for some reason a undefined value at the 0 index + let headers = worksheet.getRow(1).values as (undefined | string)[]; + // retrieve data of the table + let data = ( + worksheet.getRows(2, rowCount - 1) || /* istanbul ignore next */ [] + ).map((item) => item.values); + + // find out where the technical key is + const technical_key_index = headers.findIndex((h) => + (h || '').includes(columns.technical_key) + ); + + if (technical_key_index === -1) { + return Promise.reject( + new Error("Couldn't find index for technical_key with provided label") + ); + } + + // find out where the translations are positioned in the value + const locales_index = Object.entries(columns.locales) + .map(([key, value]) => ({ + [key]: headers.findIndex((h) => (h || '').includes(value)), + })) + .reduce((prev, curr) => Object.assign(prev, curr), {}); + + // Warn users if some locale translations couldn't be found + let missing_indexes = Object.entries(locales_index).filter( + ([_, idx]) => idx === -1 + ); + + for (let [locale] of missing_indexes) { + /* istanbul ignore next Not worthy to create a test case for that*/ + console.warn( + `Couldn't find index for ${locale} locale with provided label` + ); + } + + // build results + let results = data.map((row: any) => + Object.entries(locales_index) + // skip translation(s) where index couldn't be found + .filter(([_, idx]) => idx !== -1) + .map(([locale, localeIndex]) => ({ + technical_key: row[technical_key_index], + label: row[localeIndex], + locale: locale, + })) + ); + return Promise.resolve(flattenDeep(results)); } // default export export default { - command : command, - description: description, - builder : builder, - handler: handler -} \ No newline at end of file + command: command, + description: description, + builder: builder, + handler: handler, +}; diff --git a/src/commons/getLeavesPathes.ts b/src/commons/getLeavesPathes.ts index 8e02c77..c98a0d2 100644 --- a/src/commons/getLeavesPathes.ts +++ b/src/commons/getLeavesPathes.ts @@ -9,14 +9,14 @@ export default function getLeavesPathes(dataObj: any): string[] { let paths = [key]; if (isObject(val)) { paths = reduce(val, reducer, []); - paths = paths.map(path => key + '.' + path); + paths = paths.map((path) => key + '.' + path); } aggregator.push(...paths); return aggregator; }; const arrayIndexRegEx = /\.(\d+)(?!\w+)/gi; let paths = reduce(dataObj, reducer, []); - paths = paths.map(path => path.replace(arrayIndexRegEx, '[$1]')); + paths = paths.map((path) => path.replace(arrayIndexRegEx, '[$1]')); return paths; } diff --git a/src/middlewares/middlewares.ts b/src/middlewares/middlewares.ts index 065ac85..ae88652 100644 --- a/src/middlewares/middlewares.ts +++ b/src/middlewares/middlewares.ts @@ -61,3 +61,14 @@ export function backupPaths(prop: string, backupKey: string) { return argv; }; } + +// Turn path into function +export function parsePathToFunction(prop: string) { + return async (argv: any) => { + let param = argv[prop] as string | ((x: any) => any) | undefined; + if (param) { + argv[prop] = isString(param) ? require(param) : param; + } + return argv; + }; +} diff --git a/src/types/diffTypes.ts b/src/types/diffTypes.ts index b46af11..8eb9014 100644 --- a/src/types/diffTypes.ts +++ b/src/types/diffTypes.ts @@ -3,52 +3,52 @@ import { Argv } from 'yargs'; // Yargs diff arguments export interface CommonDiffArguments extends Argv { - filename: string; - outputDir: string; - paths: { - [file: string] : string | undefined - }; - // Diff requires at least an array of 2 items - files: [any, any, ...any[]]; - // output format - outputFormat: "JSON" + filename: string; + outputDir: string; + paths: { + [file: string]: string | undefined; + }; + // Diff requires at least an array of 2 items + files: [any, any, ...any[]]; + // output format + outputFormat: 'JSON'; } // for exporter(s) export enum ChangesOps { - DEL = "DELETE", // when key exists in file1 but not in file2 - ADD = "ADD", // when key exists in file2 but not in file1 - PUT = "REPLACED" // when key exists in both file1 & files2 but value was replaced + DEL = 'DELETE', // when key exists in file1 but not in file2 + ADD = 'ADD', // when key exists in file2 but not in file1 + PUT = 'REPLACED', // when key exists in both file1 & files2 but value was replaced } -// Describe an change, done in the direction from => to +// Describe an change, done in the direction from => to export type CommonChangeOperation = { - key: string, // Technical key of the prop compared - type: ChangesOps, // type of operation done - from: string, // first file ("file1") - to: string, // second ("file2") + key: string; // Technical key of the prop compared + type: ChangesOps; // type of operation done + from: string; // first file ("file1") + to: string; // second ("file2") }; // Describe a delete operation export type DelOperation = CommonChangeOperation & { - type: ChangesOps.DEL, - oldValue: string + type: ChangesOps.DEL; + oldValue: string; }; // Describe a add operation export type AddOperation = CommonChangeOperation & { - type: ChangesOps.ADD, - newValue: string, + type: ChangesOps.ADD; + newValue: string; }; // Describe a put operation export type PutOperation = CommonChangeOperation & { - type: ChangesOps.PUT, - oldValue: string, - newValue: string + type: ChangesOps.PUT; + oldValue: string; + newValue: string; }; -export type ChangeOperations = (DelOperation | AddOperation | PutOperation); +export type ChangeOperations = DelOperation | AddOperation | PutOperation; // arguments for exporter export interface DiffExportParameters { - // yargs, to pass dynamically option(s) without re-exporting them - yargs : CommonDiffArguments, - // the changes that occurs between files - changes: ChangeOperations[] -} \ No newline at end of file + // yargs, to pass dynamically option(s) without re-exporting them + yargs: CommonDiffArguments; + // the changes that occurs between files + changes: ChangeOperations[]; +} diff --git a/src/types/exportTypes.ts b/src/types/exportTypes.ts index 77a6eb5..1f40e96 100644 --- a/src/types/exportTypes.ts +++ b/src/types/exportTypes.ts @@ -1,5 +1,7 @@ // reuse yargs Argv type import { Argv } from 'yargs'; +// reuse exceljs Worksheet type +import { Worksheet } from 'exceljs'; // Yargs export arguments export interface CommonExportArguments extends Argv { @@ -16,7 +18,7 @@ export interface XLSXExportArguments extends CommonExportArguments { label: string; }[]; worksheetName: string; - worksheetCustomizer?: string; + worksheetCustomizer?: string | ((x: Worksheet) => Promise); } // Yargs export arguments for TO_CSV command export interface CSVExportArguments extends CommonExportArguments { diff --git a/src/types/importTypes.ts b/src/types/importTypes.ts index 7d0474e..6e9522f 100644 --- a/src/types/importTypes.ts +++ b/src/types/importTypes.ts @@ -30,7 +30,7 @@ export interface CSVImportArguments extends CommonImportArguments { delimiter: ',' | ';' | '\t' | ' ' | '|'; quote: '"' | string; escape: '"' | string; - encoding: 'utf8' | 'utf16le' | 'latin1' + encoding: 'utf8' | 'utf16le' | 'latin1'; } // Result after extract of input file diff --git a/test/diff.test.ts b/test/diff.test.ts index baff4c1..e890e0e 100644 --- a/test/diff.test.ts +++ b/test/diff.test.ts @@ -42,12 +42,12 @@ type prepare_mandatory_args_type = (...args: string[]) => string[]; const concat_cmd: concat_cmd_type = (args: string[]) => `diff ${args.join(' ')}`; const prepare_mandatory_args: prepare_mandatory_args_type = (...files) => [ - ...files.map(file => `"${file}"`), + ...files.map((file) => `"${file}"`), ]; // return the output of a given command to the parser function fetchOutput(cmd: string): Promise { - return new Promise(resolve => { + return new Promise((resolve) => { parser.parse(cmd, (_err: Error | undefined, _argv: any, output: string) => { resolve(output); }); @@ -94,19 +94,21 @@ type fsify_structure = { // to access easier the paths of test file paths const test_files_list = [ 'file1.json', - 'file2.json', + 'file2.json', 'file3.json', // to test out the json reporter 'settings1-JSON.json', - 'settings2-JSON.json' + 'settings2-JSON.json', + 'settings3-JSON.js', // TODO test out future reporters ] as const; const [ - TEST_FILE_FILE1, - TEST_FILE_FILE2, + TEST_FILE_FILE1, + TEST_FILE_FILE2, TEST_FILE_FILE3, TEST_FILE_JSON_SETTINGS1, TEST_FILE_JSON_SETTINGS2, + TEST_FILE_JSON_SETTINGS3, ] = test_files_list; type test_files_type = typeof test_files_list[number]; @@ -114,13 +116,15 @@ type test_files_type = typeof test_files_list[number]; const TEST_FILES: { [x in test_files_type]: string } = test_files_list.reduce( (acc: any, curr: test_files_type, idx: number) => { acc[curr] = path.resolve( - TEMP_FOLDER, + TEMP_FOLDER, ROOT_TEST_FOLDER, - (idx < 6) ? VALID_TEST_FOLDER : USELESS_TEST_FOLDER, + idx < 7 ? VALID_TEST_FOLDER : USELESS_TEST_FOLDER, curr ); return acc; -},{}); + }, + {} +); // generate contents for comparison const generate_i18_contents = (idx: number) => { @@ -164,23 +168,40 @@ const structure: fsify_structure = [ type: fsify.FILE, name: TEST_FILE_JSON_SETTINGS1, contents: JSON.stringify({ - filename: "diff_settings1-JSON", + filename: 'diff_settings1-JSON', outputDir: TEMP_FOLDER, - outputFormat: "JSON", - files: [TEST_FILE_FILE1, TEST_FILE_FILE2].map(file => TEST_FILES[file]) - }) + outputFormat: 'JSON', + files: [TEST_FILE_FILE1, TEST_FILE_FILE2].map( + (file) => TEST_FILES[file] + ), + }), }, // With three files { type: fsify.FILE, name: TEST_FILE_JSON_SETTINGS2, contents: JSON.stringify({ - filename: "diff_settings2-JSON", + filename: 'diff_settings2-JSON', outputDir: TEMP_FOLDER, - outputFormat: "JSON", - files: [TEST_FILE_FILE1, TEST_FILE_FILE2, TEST_FILE_FILE3].map(file => TEST_FILES[file]) - }) - } + outputFormat: 'JSON', + files: [TEST_FILE_FILE1, TEST_FILE_FILE2, TEST_FILE_FILE3].map( + (file) => TEST_FILES[file] + ), + }), + }, + // js file + { + type: fsify.FILE, + name: TEST_FILE_JSON_SETTINGS3, + contents: `module.exports = { + filename: 'diff_settings3-JSON', + outputDir: "${TEMP_FOLDER.replace(/\\/g, '\\\\')}", + outputFormat: 'JSON', + files: [${[TEST_FILE_FILE1, TEST_FILE_FILE2] + .map((file) => `"${TEST_FILES[file].replace(/\\/g, '\\\\')}"`) + .join(',')}] + }`, + }, ], }, ], @@ -188,7 +209,7 @@ const structure: fsify_structure = [ ]; // test scenarios for validations -const VALIDATIONS_SCENARIOS : [ +const VALIDATIONS_SCENARIOS: [ string, [test_files_type[], ...string[]], ...string[] @@ -197,12 +218,12 @@ const VALIDATIONS_SCENARIOS : [ // Test out the message : "At least two paths must be provided" 'Argument files - Not expected number of paths should be reject', [[TEST_FILE_FILE1]], - "At least two paths must be provided" - ] + 'At least two paths must be provided', + ], ]; // E2E scenarios for JSON reporter -const E2E_JSON_REPORTER : [ +const E2E_JSON_REPORTER: [ string, // if a single test_files_type, it is a settings file, multiple inline files otherwise [test_files_type[], ...string[]], @@ -210,53 +231,152 @@ const E2E_JSON_REPORTER : [ any ][] = [ [ - "Inline paths should be accepted", - [ [TEST_FILE_FILE1, TEST_FILE_FILE1], "--filename", `"diff_inline-JSON"`, "--outputDir", `"${TEMP_FOLDER}"`], - path.resolve(TEMP_FOLDER, "diff_inline-JSON.json"), + 'Inline paths should be accepted', + [ + [TEST_FILE_FILE1, TEST_FILE_FILE1], + '--filename', + `"diff_inline-JSON"`, + '--outputDir', + `"${TEMP_FOLDER}"`, + ], + path.resolve(TEMP_FOLDER, 'diff_inline-JSON.json'), { files: { - "file1": TEST_FILES[TEST_FILE_FILE1], - "file2": TEST_FILES[TEST_FILE_FILE1] + file1: TEST_FILES[TEST_FILE_FILE1], + file2: TEST_FILES[TEST_FILE_FILE1], }, - changes: [] - } + changes: [], + }, ], [ - "should work with two files", - [ [TEST_FILE_JSON_SETTINGS1] ], - path.resolve(TEMP_FOLDER, "diff_settings1-JSON.json"), + 'should work with two files', + [[TEST_FILE_JSON_SETTINGS1]], + path.resolve(TEMP_FOLDER, 'diff_settings1-JSON.json'), { files: { - "file1": TEST_FILES[TEST_FILE_FILE1], - "file2": TEST_FILES[TEST_FILE_FILE2] + file1: TEST_FILES[TEST_FILE_FILE1], + file2: TEST_FILES[TEST_FILE_FILE2], }, changes: [ - {"from": "file1","key": "commons.nestedKey.changedValue","newValue": "Changed value 1","oldValue": "Changed value 0","to": "file2","type": "REPLACED"}, - {"from": "file1","key": "commons.conditionalDeletedKey","oldValue": "Present","to": "file2","type": "DELETE"}, - {"from": "file1","key": "commons.array[1]","newValue": "Paul","to": "file2","type": "ADD"}, - ] - } + { + from: 'file1', + key: 'commons.nestedKey.changedValue', + newValue: 'Changed value 1', + oldValue: 'Changed value 0', + to: 'file2', + type: 'REPLACED', + }, + { + from: 'file1', + key: 'commons.conditionalDeletedKey', + oldValue: 'Present', + to: 'file2', + type: 'DELETE', + }, + { + from: 'file1', + key: 'commons.array[1]', + newValue: 'Paul', + to: 'file2', + type: 'ADD', + }, + ], + }, ], [ - "should work with three files", - [ [TEST_FILE_JSON_SETTINGS2] ], - path.resolve(TEMP_FOLDER, "diff_settings2-JSON.json"), + 'should work with three files', + [[TEST_FILE_JSON_SETTINGS2]], + path.resolve(TEMP_FOLDER, 'diff_settings2-JSON.json'), { files: { - "file1": TEST_FILES[TEST_FILE_FILE1], - "file2": TEST_FILES[TEST_FILE_FILE2], - "file3": TEST_FILES[TEST_FILE_FILE3], + file1: TEST_FILES[TEST_FILE_FILE1], + file2: TEST_FILES[TEST_FILE_FILE2], + file3: TEST_FILES[TEST_FILE_FILE3], }, changes: [ - {"key":"commons.nestedKey.changedValue","type":"REPLACED","from":"file1","to":"file2","oldValue":"Changed value 0","newValue":"Changed value 1"}, - {"key":"commons.conditionalDeletedKey","type":"DELETE","from":"file1","to":"file2","oldValue":"Present"}, - {"key":"commons.array[1]","type":"ADD","from":"file1","to":"file2","newValue":"Paul"}, - {"key":"commons.nestedKey.changedValue","type":"REPLACED","from":"file2","to":"file3","oldValue":"Changed value 1","newValue":"Changed value 2"}, - {"key":"commons.array[2]","type":"ADD","from":"file2","to":"file3","newValue":"Jacques"}, - {"key":"commons.conditionalDeletedKey","type":"ADD","from":"file2","to":"file3","newValue":"Present"}] - } - ] -] + { + key: 'commons.nestedKey.changedValue', + type: 'REPLACED', + from: 'file1', + to: 'file2', + oldValue: 'Changed value 0', + newValue: 'Changed value 1', + }, + { + key: 'commons.conditionalDeletedKey', + type: 'DELETE', + from: 'file1', + to: 'file2', + oldValue: 'Present', + }, + { + key: 'commons.array[1]', + type: 'ADD', + from: 'file1', + to: 'file2', + newValue: 'Paul', + }, + { + key: 'commons.nestedKey.changedValue', + type: 'REPLACED', + from: 'file2', + to: 'file3', + oldValue: 'Changed value 1', + newValue: 'Changed value 2', + }, + { + key: 'commons.array[2]', + type: 'ADD', + from: 'file2', + to: 'file3', + newValue: 'Jacques', + }, + { + key: 'commons.conditionalDeletedKey', + type: 'ADD', + from: 'file2', + to: 'file3', + newValue: 'Present', + }, + ], + }, + ], + [ + 'should work with js config file', + [[TEST_FILE_JSON_SETTINGS3]], + path.resolve(TEMP_FOLDER, 'diff_settings3-JSON.json'), + { + files: { + file1: TEST_FILES[TEST_FILE_FILE1], + file2: TEST_FILES[TEST_FILE_FILE2], + }, + changes: [ + { + from: 'file1', + key: 'commons.nestedKey.changedValue', + newValue: 'Changed value 1', + oldValue: 'Changed value 0', + to: 'file2', + type: 'REPLACED', + }, + { + from: 'file1', + key: 'commons.conditionalDeletedKey', + oldValue: 'Present', + to: 'file2', + type: 'DELETE', + }, + { + from: 'file1', + key: 'commons.array[1]', + newValue: 'Paul', + to: 'file2', + type: 'ADD', + }, + ], + }, + ], +]; beforeAll(() => { // write temporary files @@ -264,89 +384,115 @@ beforeAll(() => { }); describe('[diff command]', () => { + describe('Check command availability', () => { + it('Should display diff help output', async () => { + const output = await fetchOutput('diff --help'); + expect(output).toMatch(describeText); + }); + }); - describe('Check command availability', () => { - - it('Should display diff help output', async () => { - const output = await fetchOutput('diff --help'); - expect(output).toMatch(describeText); - }); - + describe('Validations', () => { + // mock console.log + let consoleLog: any; + beforeAll(() => { + consoleLog = jest.spyOn(console, 'log').mockImplementation(); }); - describe('Validations', () => { - // mock console.log - let consoleLog: any; - beforeAll(() => { - consoleLog = jest.spyOn(console, 'log').mockImplementation(); - }); - - // restore console.log - afterAll(() => { - if (consoleLog !== undefined) { - consoleLog.mockRestore(); - } - }); + // restore console.log + afterAll(() => { + if (consoleLog !== undefined) { + consoleLog.mockRestore(); + } + }); - test.each(VALIDATIONS_SCENARIOS)('%s', async(_title: string, args: [test_files_type[], ...string[]], ...messages: string[]) => { + test.each(VALIDATIONS_SCENARIOS)( + '%s', + async ( + _title: string, + args: [test_files_type[], ...string[]], + ...messages: string[] + ) => { let [files, ...otherArgs] = args; let test_cmd = concat_cmd([ // optional args ...otherArgs, // mandatory args - ...prepare_mandatory_args(...files.map(file => TEST_FILES[file])) + ...prepare_mandatory_args(...files.map((file) => TEST_FILES[file])), ]); //console.warn(test_cmd); // Test out if error message is thrown await expectError(test_cmd, ...messages); - }); + } + ); + }); + describe('E2E successful scenarios', () => { + // mock console.log + let consoleLog: any; + beforeAll(() => { + consoleLog = jest.spyOn(console, 'log').mockImplementation(); }); - describe('E2E successful scenarios', () => { - // mock console.log - let consoleLog: any; - beforeAll(() => { - consoleLog = jest.spyOn(console, 'log').mockImplementation(); - }); - - // clear mock after each call - afterEach(() => { - consoleLog.mockClear(); - }); - - // reenable console.log - afterAll(() => { - // restore console.log - if (consoleLog !== undefined) { - consoleLog.mockRestore(); - } - }); + // clear mock after each call + afterEach(() => { + consoleLog.mockClear(); + }); - // JSON reporter tests - test.each(E2E_JSON_REPORTER)('JSON reporter - %s', async(_title: string, args: [test_files_type[], ...string[]], filepath: string, expectedObj: any) => { + // reenable console.log + afterAll(() => { + // restore console.log + if (consoleLog !== undefined) { + consoleLog.mockRestore(); + } + }); + + // JSON reporter tests + test.each(E2E_JSON_REPORTER)( + 'JSON reporter - %s', + async ( + _title: string, + args: [test_files_type[], ...string[]], + filepath: string, + expectedObj: any + ) => { let [files, ...otherArgs] = args; let test_cmd = concat_cmd([ - ...( (files.length === 1) ? ["--settings", ...prepare_mandatory_args(...files.map(file => TEST_FILES[file]))] : [] ), + ...(files.length === 1 + ? [ + '--settings', + ...prepare_mandatory_args( + ...files.map((file) => TEST_FILES[file]) + ), + ] + : []), // optional args ...otherArgs, // mandatory args (if needed) - ...( (files.length >= 2) ? [...prepare_mandatory_args(...files.map(file => TEST_FILES[file]))] : []) + ...(files.length >= 2 + ? [ + ...prepare_mandatory_args( + ...files.map((file) => TEST_FILES[file]) + ), + ] + : []), ]); await parser.parseAsync(test_cmd); - expect(consoleLog).toHaveBeenCalledWith('Preparing the report file ...'); - expect(consoleLog).toHaveBeenCalledWith("Successfully wrote the report file"); + expect(consoleLog).toHaveBeenCalledWith( + 'Preparing the report file ...' + ); + expect(consoleLog).toHaveBeenCalledWith( + 'Successfully wrote the report file' + ); // check out the file let potentialJSON = await fs.promises.readFile(filepath, 'utf-8'); let result = JSON.parse(potentialJSON); // checking the result expect(result).toEqual(expectedObj); - }); - - }); - -}); \ No newline at end of file + } + ); + }); +}); diff --git a/test/export/export-csv.test.ts b/test/export/export-csv.test.ts index 9ce9798..4163386 100644 --- a/test/export/export-csv.test.ts +++ b/test/export/export-csv.test.ts @@ -44,12 +44,12 @@ const locale_label = (locale: string) => `${KEYS_LABEL[locale]} translation`; const generate_i18n = (locale: string) => ({ commons: { myNestedKey: `Hello world ${locale}`, - myNestedArray: ['1', '2', '3'].map(item => `${item} ${locale}`) + myNestedArray: ['1', '2', '3'].map((item) => `${item} ${locale}`), }, - array: ['1', '2', '3'].map(item => `${item} ${locale}`), + array: ['1', '2', '3'].map((item) => `${item} ${locale}`), simpleKey: `[${locale}] not setted key`, - "Key with spaces": [ {"test": "42 is the answer"} ], - "Missing key in DE": (locale !== TRANSLATIONS_KEYS[2]) ? "present" : undefined + 'Key with spaces': [{ test: '42 is the answer' }], + 'Missing key in DE': locale !== TRANSLATIONS_KEYS[2] ? 'present' : undefined, }); // Export files @@ -64,7 +64,7 @@ const generate_files = ( // Export columns const EXPORT_COLUMNS = (locales: string[]) => - locales.map(locale => ({ + locales.map((locale) => ({ locale, label: locale_label(locale), })); @@ -90,6 +90,7 @@ const test_files_list = [ 'emptyObject.json', 'emptyArray.json', 'files-duplicatedValues.json', + 'files-invalidPath.json', 'columns-missingLabelProp.json', 'columns-wrongPropValue.json', 'columns-duplicatedValues.json', @@ -103,6 +104,7 @@ const [ TEST_FILE_EMPTY_OBJECT, TEST_FILE_EMPTY_ARRAY, TEST_FILE_FILES_DUP, + TEST_FILE_FILES_INVALID, TEST_FILE_EXPORT_COLUMNS_MISS_PROP, TEST_FILE_EXPORT_COLUMNS_WRONG_PROP, TEST_FILE_EXPORT_COLUMNS_DUP_VALS, @@ -122,7 +124,7 @@ const structure: fsify_structure = [ name: VALID_TEST_FOLDER, contents: flat([ // 3 i18n files - TRANSLATIONS_KEYS.map(locale => ({ + TRANSLATIONS_KEYS.map((locale) => ({ type: fsify.FILE, name: `${locale.toLowerCase()}.json`, contents: JSON.stringify(generate_i18n(locale)), @@ -138,7 +140,7 @@ const structure: fsify_structure = [ type: fsify.FILE, name: TEST_FILE_FILES, contents: JSON.stringify( - generate_files(TRANSLATIONS_KEYS, locale => + generate_files(TRANSLATIONS_KEYS, (locale) => path.resolve( TEMP_FOLDER, ROOT_TEST_FOLDER, @@ -174,7 +176,7 @@ const structure: fsify_structure = [ type: fsify.FILE, name: TEST_FILE_SETTINGS2, contents: JSON.stringify({ - files: generate_files(TRANSLATIONS_KEYS, locale => + files: generate_files(TRANSLATIONS_KEYS, (locale) => path.resolve( TEMP_FOLDER, ROOT_TEST_FOLDER, @@ -211,7 +213,7 @@ const structure: fsify_structure = [ type: fsify.FILE, name: TEST_FILE_FILES_DUP, contents: JSON.stringify( - generate_files(TRANSLATIONS_KEYS, _ => + generate_files(TRANSLATIONS_KEYS, (_) => path.resolve( TEMP_FOLDER, ROOT_TEST_FOLDER, @@ -221,6 +223,14 @@ const structure: fsify_structure = [ ) ), }, + // files.json with invalid path + { + type: fsify.FILE, + name: TEST_FILE_FILES_INVALID, + contents: JSON.stringify({ + fr: '/not/a/valid/path/fr.json', + }), + }, // columns.json with missing property (label) { type: fsify.FILE, @@ -282,7 +292,7 @@ const parser = yargs.command(command, describeText, builder).help(); // return the output of a given command to the parser function fetchOutput(cmd: string): Promise { - return new Promise(resolve => { + return new Promise((resolve) => { parser.parse(cmd, (_err: Error | undefined, _argv: any, output: string) => { resolve(output); }); @@ -296,18 +306,18 @@ async function expectError(cmd: string, ...messages: string[]) { // In tests, I had to make sure yargs doesn't override error for the following reason : // Even when validation failed, it somehow can go to handler() let isFirstError = true; - + // add fail() handler // Because of problem explained above, I had to ignore if an error occurs afterwards try { await parser - .fail((_, e) => { - if (isFirstError) { - isFirstError = false; - error = e; - } - }) - .parseAsync(cmd); + .fail((_, e) => { + if (isFirstError) { + isFirstError = false; + error = e; + } + }) + .parseAsync(cmd); } catch (_) {} // check if error was set expect(error).not.toEqual(undefined); @@ -329,20 +339,11 @@ const prepare_mandatory_args: prepare_mandatory_args_type = ( ) => ['--files', `"${args[0]}"`, '--columns', `"${args[1]}"`]; // test scenarios for validations -const VALIDATIONS_SCENARIOS : [ - string, - string[], - ...string[] -][] = [ +const VALIDATIONS_SCENARIOS: [string, string[], ...string[]][] = [ [ // Test out the message : "Error: test.csv has an extension : Remove it please" 'Filename with extension should be rejected', - [ - TEST_FILE_FILES, - TEST_FILE_EXPORT_COLUMNS, - '--filename', - `"test.csv"`, - ], + [TEST_FILE_FILES, TEST_FILE_EXPORT_COLUMNS, '--filename', `"test.csv"`], 'test.csv', 'extension', ], @@ -350,7 +351,7 @@ const VALIDATIONS_SCENARIOS : [ // Test out the message : "Option files is not a JSON Object" 'Option files - unexpected file should be rejected', [TEST_FILE_EMPTY_ARRAY, TEST_FILE_EXPORT_COLUMNS], - 'not a JSON Object' + 'not a JSON Object', ], [ // Test out the message : "Option files should have at least one entry" @@ -364,6 +365,12 @@ const VALIDATIONS_SCENARIOS : [ [TEST_FILE_FILES_DUP, TEST_FILE_EXPORT_COLUMNS], 'duplicated value', ], + [ + // Test out the message : `${i18nPath} cannot be read : check permissions` + 'Option files - invalid path(s) should be rejected', + [TEST_FILE_FILES_INVALID, TEST_FILE_EXPORT_COLUMNS], + 'cannot be read', + ], [ // Test out the message : "columns is not a JSON Array" 'Option columns - unexpected file should be rejected', @@ -401,7 +408,7 @@ const VALIDATIONS_SCENARIOS : [ 'Options files & columns - incompatibles files should be rejected', [TEST_FILE_FILES, TEST_FILE_EXPORT_COLUMNS_MISS_KEY], 'between files and columns', - ] + ], ]; describe('[export_csv command]', () => { @@ -431,24 +438,26 @@ describe('[export_csv command]', () => { } }); - test.each(VALIDATIONS_SCENARIOS)('%s', async (_title: string, args: string[], ...messages: string[]) => { - let [files, columns, ...otherArgs] = args; - let test_cmd = concat_cmd([ - // mandatory args - ...prepare_mandatory_args( - TEST_FILES[files as test_files_type], - TEST_FILES[columns as test_files_type] - ), - // optional args - ...otherArgs, - ]); - //console.warn(test_cmd); - // Test out if error message is thrown - await expectError(test_cmd, ...messages); - }); + test.each(VALIDATIONS_SCENARIOS)( + '%s', + async (_title: string, args: string[], ...messages: string[]) => { + let [files, columns, ...otherArgs] = args; + let test_cmd = concat_cmd([ + // mandatory args + ...prepare_mandatory_args( + TEST_FILES[files as test_files_type], + TEST_FILES[columns as test_files_type] + ), + // optional args + ...otherArgs, + ]); + //console.warn(test_cmd); + // Test out if error message is thrown + await expectError(test_cmd, ...messages); + } + ); }); - describe('E2E successful scenarios', () => { // mock console.log let consoleLog: any; @@ -471,7 +480,7 @@ describe('[export_csv command]', () => { test.each([ ['(Paths)', TEST_FILE_SETTINGS1], - ['(Object/Array instead of Paths)', TEST_FILE_SETTINGS2] + ['(Object/Array instead of Paths)', TEST_FILE_SETTINGS2], ])( 'settings.json %s', async (_title: string, settingsFile: test_files_type) => { @@ -495,5 +504,4 @@ describe('[export_csv command]', () => { } ); }); - -}); \ No newline at end of file +}); diff --git a/test/export/export-xlsx.test.ts b/test/export/export-xlsx.test.ts index ed9ece7..a9afadd 100644 --- a/test/export/export-xlsx.test.ts +++ b/test/export/export-xlsx.test.ts @@ -44,12 +44,12 @@ const locale_label = (locale: string) => `${KEYS_LABEL[locale]} translation`; const generate_i18n = (locale: string) => ({ commons: { myNestedKey: `Hello world ${locale}`, - myNestedArray: ['1', '2', '3'].map(item => `${item} ${locale}`) + myNestedArray: ['1', '2', '3'].map((item) => `${item} ${locale}`), }, - array: ['1', '2', '3'].map(item => `${item} ${locale}`), + array: ['1', '2', '3'].map((item) => `${item} ${locale}`), simpleKey: `[${locale}] not setted key`, - "Key with spaces": [ {"test": "42 is the answer"} ], - "Missing key in DE": (locale !== TRANSLATIONS_KEYS[2]) ? "present" : undefined + 'Key with spaces': [{ test: '42 is the answer' }], + 'Missing key in DE': locale !== TRANSLATIONS_KEYS[2] ? 'present' : undefined, }); // Export files @@ -64,7 +64,7 @@ const generate_files = ( // Export columns const EXPORT_COLUMNS = (locales: string[]) => - locales.map(locale => ({ + locales.map((locale) => ({ locale, label: locale_label(locale), })); @@ -87,17 +87,19 @@ const test_files_list = [ 'settings1.json', 'settings2.json', 'settings3.json', + 'settings4.js', // wrong files 'emptyObject.json', 'emptyArray.json', 'files-duplicatedValues.json', + 'files-invalidPath.json', 'columns-missingLabelProp.json', 'columns-wrongPropValue.json', 'columns-duplicatedValues.json', 'columns-missingKey.json', // wrong worksheetCustomizer implementations 'worksheetCustomizer-notAFunction.json', - 'worksheetCustomizer-wrongArity.js' + 'worksheetCustomizer-wrongArity.js', ] as const; const [ TEST_FILE_EXPORT_COLUMNS, @@ -105,15 +107,17 @@ const [ TEST_FILE_SETTINGS1, TEST_FILE_SETTINGS2, TEST_FILE_SETTINGS3, + TEST_FILE_SETTINGS4, TEST_FILE_EMPTY_OBJECT, TEST_FILE_EMPTY_ARRAY, TEST_FILE_FILES_DUP, + TEST_FILE_FILES_INVALID, TEST_FILE_EXPORT_COLUMNS_MISS_PROP, TEST_FILE_EXPORT_COLUMNS_WRONG_PROP, TEST_FILE_EXPORT_COLUMNS_DUP_VALS, TEST_FILE_EXPORT_COLUMNS_MISS_KEY, TEST_FILE_WORKSHEETCUSTOMIZER_NAF, - TEST_FILE_WORKSHEETCUSTOMIZER_WA + TEST_FILE_WORKSHEETCUSTOMIZER_WA, ] = test_files_list; type test_files_type = typeof test_files_list[number]; @@ -129,7 +133,7 @@ const structure: fsify_structure = [ name: VALID_TEST_FOLDER, contents: flat([ // 3 i18n files - TRANSLATIONS_KEYS.map(locale => ({ + TRANSLATIONS_KEYS.map((locale) => ({ type: fsify.FILE, name: `${locale.toLowerCase()}.json`, contents: JSON.stringify(generate_i18n(locale)), @@ -145,7 +149,7 @@ const structure: fsify_structure = [ type: fsify.FILE, name: TEST_FILE_FILES, contents: JSON.stringify( - generate_files(TRANSLATIONS_KEYS, locale => + generate_files(TRANSLATIONS_KEYS, (locale) => path.resolve( TEMP_FOLDER, ROOT_TEST_FOLDER, @@ -182,7 +186,7 @@ const structure: fsify_structure = [ type: fsify.FILE, name: TEST_FILE_SETTINGS2, contents: JSON.stringify({ - files: generate_files(TRANSLATIONS_KEYS, locale => + files: generate_files(TRANSLATIONS_KEYS, (locale) => path.resolve( TEMP_FOLDER, ROOT_TEST_FOLDER, @@ -215,15 +219,44 @@ const structure: fsify_structure = [ ), worksheetCustomizer: path.resolve( __dirname, - "..", - "fixtures/export-xlsx", - "worksheetCustomizer-dynamic.js" + '..', + 'fixtures/export-xlsx', + 'worksheetCustomizer-dynamic.js' ), worksheetName: 'Settings 3 - Worksheet', filename: 'settings3-output', outputDir: TEMP_FOLDER, }), - } + }, + // First format of settings.js (Mixins config) + { + type: fsify.FILE, + name: TEST_FILE_SETTINGS4, + // As fsify uses fs.writeFile, we need to double backslash stuff again + contents: `module.exports = { + "files": "${path + .resolve( + TEMP_FOLDER, + ROOT_TEST_FOLDER, + VALID_TEST_FOLDER, + TEST_FILE_FILES + ) + .replace(/\\/g, '\\\\')}", + "columns": "${path + .resolve( + TEMP_FOLDER, + ROOT_TEST_FOLDER, + VALID_TEST_FOLDER, + TEST_FILE_EXPORT_COLUMNS + ) + .replace(/\\/g, '\\\\')}", + "worksheetCustomizer" : async function(worksheet) { return worksheet }, + "worksheetName": "Settings 4 - Worksheet", + "filename": 'settings4-output', + "outputDir": "${TEMP_FOLDER.replace(/\\/g, '\\\\')}" + } + `, + }, ]), }, // In this folder, files used for validations @@ -248,7 +281,7 @@ const structure: fsify_structure = [ type: fsify.FILE, name: TEST_FILE_FILES_DUP, contents: JSON.stringify( - generate_files(TRANSLATIONS_KEYS, _ => + generate_files(TRANSLATIONS_KEYS, (_) => path.resolve( TEMP_FOLDER, ROOT_TEST_FOLDER, @@ -258,6 +291,14 @@ const structure: fsify_structure = [ ) ), }, + // files.json with invalid path + { + type: fsify.FILE, + name: TEST_FILE_FILES_INVALID, + contents: JSON.stringify({ + fr: '/not/a/valid/path/fr.json', + }), + }, // columns.json with missing property (label) { type: fsify.FILE, @@ -291,14 +332,14 @@ const structure: fsify_structure = [ { type: fsify.FILE, name: TEST_FILE_WORKSHEETCUSTOMIZER_NAF, - contents: JSON.stringify({"message": "helloWorld"}) + contents: JSON.stringify({ message: 'helloWorld' }), }, // worksheetCustomer : wrong arity { type: fsify.FILE, name: TEST_FILE_WORKSHEETCUSTOMIZER_WA, - contents: "module.exports = function() {}" - } + contents: 'module.exports = function() {}', + }, ], }, ], @@ -312,7 +353,7 @@ const TEST_FILES: { [x in test_files_type]: string } = test_files_list.reduce( let arr = [ TEMP_FOLDER, ROOT_TEST_FOLDER, - idx < 5 ? VALID_TEST_FOLDER : USELESS_TEST_FOLDER, + idx < 6 ? VALID_TEST_FOLDER : USELESS_TEST_FOLDER, curr, ]; acc[curr] = path.resolve(...arr); @@ -331,7 +372,7 @@ const parser = yargs.command(command, describeText, builder).help(); // return the output of a given command to the parser function fetchOutput(cmd: string): Promise { - return new Promise(resolve => { + return new Promise((resolve) => { parser.parse(cmd, (_err: Error | undefined, _argv: any, output: string) => { resolve(output); }); @@ -345,18 +386,18 @@ async function expectError(cmd: string, ...messages: string[]) { // In tests, I had to make sure yargs doesn't override error for the following reason : // Even when validation failed, it somehow can go to handler() let isFirstError = true; - + // add fail() handler // Because of problem explained above, I had to ignore if an error occurs afterwards try { await parser - .fail((_, e) => { - if (isFirstError) { - isFirstError = false; - error = e; - } - }) - .parseAsync(cmd); + .fail((_, e) => { + if (isFirstError) { + isFirstError = false; + error = e; + } + }) + .parseAsync(cmd); } catch (_) {} // check if error was set expect(error).not.toEqual(undefined); @@ -378,20 +419,11 @@ const prepare_mandatory_args: prepare_mandatory_args_type = ( ) => ['--files', `"${args[0]}"`, '--columns', `"${args[1]}"`]; // test scenarios for validations -const VALIDATIONS_SCENARIOS : [ - string, - string[], - ...string[] -][] = [ +const VALIDATIONS_SCENARIOS: [string, string[], ...string[]][] = [ [ // Test out the message : "Error: test.xlsx has an extension : Remove it please" 'Filename with extension should be rejected', - [ - TEST_FILE_FILES, - TEST_FILE_EXPORT_COLUMNS, - '--filename', - `"test.xlsx"`, - ], + [TEST_FILE_FILES, TEST_FILE_EXPORT_COLUMNS, '--filename', `"test.xlsx"`], 'test.xlsx', 'extension', ], @@ -399,7 +431,7 @@ const VALIDATIONS_SCENARIOS : [ // Test out the message : "Option files is not a JSON Object" 'Option files - unexpected file should be rejected', [TEST_FILE_EMPTY_ARRAY, TEST_FILE_EXPORT_COLUMNS], - 'not a JSON Object' + 'not a JSON Object', ], [ // Test out the message : "Option files should have at least one entry" @@ -413,6 +445,12 @@ const VALIDATIONS_SCENARIOS : [ [TEST_FILE_FILES_DUP, TEST_FILE_EXPORT_COLUMNS], 'duplicated value', ], + [ + // Test out the message : `${i18nPath} cannot be read : check permissions` + 'Option files - invalid path(s) should be rejected', + [TEST_FILE_FILES_INVALID, TEST_FILE_EXPORT_COLUMNS], + 'cannot be read', + ], [ // Test out the message : "columns is not a JSON Array" 'Option columns - unexpected file should be rejected', @@ -457,10 +495,10 @@ const VALIDATIONS_SCENARIOS : [ [ TEST_FILE_FILES, TEST_FILE_EXPORT_COLUMNS, - "--worksheetCustomizer", - `"${TEST_FILES[TEST_FILE_WORKSHEETCUSTOMIZER_NAF]}"` + '--worksheetCustomizer', + `"${TEST_FILES[TEST_FILE_WORKSHEETCUSTOMIZER_NAF]}"`, ], - "is not an function" + 'is not an function', ], [ // Test out thhe message : "worksheetCustomizer is not an function or doesn't take an single argument" @@ -468,10 +506,10 @@ const VALIDATIONS_SCENARIOS : [ [ TEST_FILE_FILES, TEST_FILE_EXPORT_COLUMNS, - "--worksheetCustomizer", - `"${TEST_FILES[TEST_FILE_WORKSHEETCUSTOMIZER_WA]}"` + '--worksheetCustomizer', + `"${TEST_FILES[TEST_FILE_WORKSHEETCUSTOMIZER_WA]}"`, ], - "doesn't take an single argument" + "doesn't take an single argument", ], ]; @@ -502,24 +540,26 @@ describe('[export_xlsx command]', () => { } }); - test.each(VALIDATIONS_SCENARIOS)('%s', async (_title: string, args: string[], ...messages: string[]) => { - let [files, columns, ...otherArgs] = args; - let test_cmd = concat_cmd([ - // mandatory args - ...prepare_mandatory_args( - TEST_FILES[files as test_files_type], - TEST_FILES[columns as test_files_type] - ), - // optional args - ...otherArgs, - ]); - //console.warn(test_cmd); - // Test out if error message is thrown - await expectError(test_cmd, ...messages); - }); + test.each(VALIDATIONS_SCENARIOS)( + '%s', + async (_title: string, args: string[], ...messages: string[]) => { + let [files, columns, ...otherArgs] = args; + let test_cmd = concat_cmd([ + // mandatory args + ...prepare_mandatory_args( + TEST_FILES[files as test_files_type], + TEST_FILES[columns as test_files_type] + ), + // optional args + ...otherArgs, + ]); + //console.warn(test_cmd); + // Test out if error message is thrown + await expectError(test_cmd, ...messages); + } + ); }); - describe('E2E successful scenarios', () => { // mock console.log let consoleLog: any; @@ -541,31 +581,29 @@ describe('[export_xlsx command]', () => { }); test.each([ - ['(Paths)', TEST_FILE_SETTINGS1], - ['(Object/Array instead of Paths)', TEST_FILE_SETTINGS2], - ['(Include the worksheetCustomizer)', TEST_FILE_SETTINGS3] - ])( - 'settings.json %s', - async (_title: string, settingsFile: test_files_type) => { - let test_cmd = concat_cmd([ - '--settings', - `"${TEST_FILES[settingsFile]}"`, - ]); - // example : 'settings1-output' - let expectedFile = path.resolve( - TEMP_FOLDER, - `${settingsFile.substring(0, settingsFile.length - 5)}-output.xlsx` - ); - // run command - //console.warn(test_cmd); - await parser.parseAsync(test_cmd); + ['settings.json (Paths)', TEST_FILE_SETTINGS1], + ['settings.json (Object/Array instead of Paths)', TEST_FILE_SETTINGS2], + [ + 'settings.json (Include worksheetCustomizer as string)', + TEST_FILE_SETTINGS3, + ], + ['settings.js (Include worksheetCustomizer as fct)', TEST_FILE_SETTINGS4], + ])('%s', async (_title: string, settingsFile: test_files_type) => { + let test_cmd = concat_cmd([ + '--settings', + `"${TEST_FILES[settingsFile]}"`, + ]); + // example : 'settings1-output' + let filename = settingsFile.substring(0, settingsFile.lastIndexOf('.')); + let expectedFile = path.resolve(TEMP_FOLDER, `${filename}-output.xlsx`); + // run command + //console.warn(test_cmd); + await parser.parseAsync(test_cmd); - expect(consoleLog).toHaveBeenCalledWith('Preparing XLSX file ...'); - expect(consoleLog).toHaveBeenCalledWith( - `${expectedFile} successfully written` - ); - } - ); + expect(consoleLog).toHaveBeenCalledWith('Preparing XLSX file ...'); + expect(consoleLog).toHaveBeenCalledWith( + `${expectedFile} successfully written` + ); + }); }); - -}); \ No newline at end of file +}); diff --git a/test/fixtures/export-xlsx/worksheetCustomizer-dynamic.js b/test/fixtures/export-xlsx/worksheetCustomizer-dynamic.js index 83dc555..c1ea393 100644 --- a/test/fixtures/export-xlsx/worksheetCustomizer-dynamic.js +++ b/test/fixtures/export-xlsx/worksheetCustomizer-dynamic.js @@ -2,7 +2,7 @@ // (So I can easily update this script in the future) //import { Worksheet } from "exceljs"; -module.exports = async function(worksheet /*: Worksheet*/) { +module.exports = async function (worksheet /*: Worksheet*/) { // Conditionaly formatting (to better view stuff) let rowCount = worksheet.rowCount; let columnCount = worksheet.columnCount; diff --git a/test/getLeavesPathes.test.ts b/test/getLeavesPathes.test.ts index 6be3af6..9282ceb 100644 --- a/test/getLeavesPathes.test.ts +++ b/test/getLeavesPathes.test.ts @@ -1,70 +1,74 @@ -import getLeavesPathes from "../src/commons/getLeavesPathes" +import getLeavesPathes from '../src/commons/getLeavesPathes'; // scenarios for testing -const PATH_SCENARIOS : [ - string, - any, - string[] -][] = [ - [ - "Simple keys", - { - "key": 42, - "someArray": [0,1,2] +const PATH_SCENARIOS: [string, any, string[]][] = [ + [ + 'Simple keys', + { + key: 42, + someArray: [0, 1, 2], + }, + ['key', 'someArray[0]', 'someArray[1]', 'someArray[2]'], + ], + [ + 'Nested object keys should work', + { + commons: { + firstNestedKey: 'Hello', + units: { + secondNestedKey: 'World !', }, - ["key", "someArray[0]", "someArray[1]", "someArray[2]"] - ], - [ - "Nested object keys should work", - { - "commons": { - "firstNestedKey": "Hello", - "units": { - "secondNestedKey": "World !" - } - } + }, + }, + ['commons.firstNestedKey', 'commons.units.secondNestedKey'], + ], + [ + 'Key that starts with number(s) should be correctly handled', + { + commons: { + units: { + '5ml': 42, }, - ["commons.firstNestedKey", "commons.units.secondNestedKey"] - ], - [ - "Key that starts with number(s) should be correctly handled", + }, + }, + ['commons.units.5ml'], + ], + [ + 'Key with spaces should be correctly handled', + { + 'Key with spaces': '42', + }, + ['Key with spaces'], + ], + [ + 'Nested objects inside array should be correctly handled', + { + someArray: [ { - "commons": { - "units": { - "5ml": 42 - } - } + type: 'CRITICAL', + message: 'Fatal error', }, - ["commons.units.5ml"] - ], - [ - "Key with spaces should be correctly handled", { - "Key with spaces": "42" + type: 'WARNING', + message: 'Deal with syntax', }, - ["Key with spaces"] - ], + ], + }, [ - "Nested objects inside array should be correctly handled", - { - "someArray": [ - { - "type": "CRITICAL", - "message": "Fatal error" - }, - { - "type": "WARNING", - "message": "Deal with syntax" - } - ] - }, - ["someArray[0].type", "someArray[0].message", "someArray[1].type", "someArray[1].message"] - ] + 'someArray[0].type', + 'someArray[0].message', + 'someArray[1].type', + 'someArray[1].message', + ], + ], ]; describe('[commons - getLeavesPathes]', () => { - test.each(PATH_SCENARIOS)('%s', async(_title: string, obj: any, expectedArray: string[]) => { - const paths = getLeavesPathes(obj); - expect(paths.sort()).toEqual(expectedArray.sort()); - }); -}); \ No newline at end of file + test.each(PATH_SCENARIOS)( + '%s', + async (_title: string, obj: any, expectedArray: string[]) => { + const paths = getLeavesPathes(obj); + expect(paths.sort()).toEqual(expectedArray.sort()); + } + ); +}); diff --git a/test/import/import-csv.test.ts b/test/import/import-csv.test.ts index 2d648a3..31a1ce8 100644 --- a/test/import/import-csv.test.ts +++ b/test/import/import-csv.test.ts @@ -15,8 +15,8 @@ const TEMP_FOLDER = os.tmpdir(); // test folders constants const ROOT_TEST_FOLDER = 'tests-for-import-csv'; const [VALID_TEST_FOLDER, USELESS_TEST_FOLDER] = [ - 'correct', // folder where every file are correct - 'useless', // folder where file has an useless content + 'correct', // folder where every file are correct + 'useless', // folder where file has an useless content ]; // initialise fsify @@ -36,16 +36,25 @@ const parser = yargs.command(command, describeText, builder).help(); // to concat faster command type concat_cmd_type = (args: string[]) => string; -type prepare_mandatory_args_type = (...args: [string, string, string[]]) => string[]; +type prepare_mandatory_args_type = ( + ...args: [string, string, string[]] +) => string[]; const concat_cmd: concat_cmd_type = (args: string[]) => `import from_csv ${args.join(' ')}`; const prepare_mandatory_args: prepare_mandatory_args_type = ( ...[input, columns, ...locales] -) => ['--input', `"${input}"`, '--columns', `"${columns}"`, '--locales', locales.join(' ')]; +) => [ + '--input', + `"${input}"`, + '--columns', + `"${columns}"`, + '--locales', + locales.join(' '), +]; // return the output of a given command to the parser function fetchOutput(cmd: string): Promise { - return new Promise(resolve => { + return new Promise((resolve) => { parser.parse(cmd, (_err: Error | undefined, _argv: any, output: string) => { resolve(output); }); @@ -54,130 +63,123 @@ function fetchOutput(cmd: string): Promise { // makes assertions on errors async function expectError(cmd: string, ...messages: string[]) { - // error to be retrieve - let error: any = undefined; - // In tests, I had to make sure yargs doesn't override error for the following reason : - // Even when validation failed, it somehow can go to handler() - let isFirstError = true; - - // add fail() handler - // Because of problem explained above, I had to ignore if an error occurs afterwards - try { - await parser + // error to be retrieve + let error: any = undefined; + // In tests, I had to make sure yargs doesn't override error for the following reason : + // Even when validation failed, it somehow can go to handler() + let isFirstError = true; + + // add fail() handler + // Because of problem explained above, I had to ignore if an error occurs afterwards + try { + await parser .fail((_, e) => { if (isFirstError) { isFirstError = false; error = e; } }) - .parseAsync(cmd); - } catch (_) {} - // check if error was set - expect(error).not.toEqual(undefined); - // check if it is an error Object - expect(error).toHaveProperty('message'); - // check if error message contains expected element - for (let expectedStr of messages) { - expect((error as Error).message).toMatch(expectedStr); - } + .parseAsync(cmd); + } catch (_) {} + // check if error was set + expect(error).not.toEqual(undefined); + // check if it is an error Object + expect(error).toHaveProperty('message'); + // check if error message contains expected element + for (let expectedStr of messages) { + expect((error as Error).message).toMatch(expectedStr); + } } // to access easier the paths of test file paths const test_files_list = [ - // inpput file - 'export-csv.csv', - // correct files - 'columns.json', - 'settings1.json', - 'settings2.json', - // wrong files - 'emptyObject.json', - 'emptyArray.json', - // wrong columns.json - 'columns-technicalKeyNotString.json', - 'columns-localesNotAObject.json', - 'columns-localesValuesNotString.json' + // inpput file + 'export-csv.csv', + // correct files + 'columns.json', + 'settings1.json', + 'settings2.json', + // wrong files + 'emptyObject.json', + 'emptyArray.json', + // wrong columns.json + 'columns-technicalKeyNotString.json', + 'columns-localesNotAObject.json', + 'columns-localesValuesNotString.json', ] as const; const [ - TEST_FILE_INPUT, - TEST_FILE_COLUMNS, - TEST_FILE_SETTINGS1, - TEST_FILE_SETTINGS2, - TEST_FILE_EMPTY_OBJECT, - TEST_FILE_EMPTY_ARRAY, - TEST_FILE_COLUMNS_TKNS, - TEST_FILE_COLUMNS_LNAO, - TEST_FILE_COLUMNS_LVNS + TEST_FILE_INPUT, + TEST_FILE_COLUMNS, + TEST_FILE_SETTINGS1, + TEST_FILE_SETTINGS2, + TEST_FILE_EMPTY_OBJECT, + TEST_FILE_EMPTY_ARRAY, + TEST_FILE_COLUMNS_TKNS, + TEST_FILE_COLUMNS_LNAO, + TEST_FILE_COLUMNS_LVNS, ] = test_files_list; type test_files_type = typeof test_files_list[number]; // files path const TEST_FILES: { [x in test_files_type]: string } = test_files_list.reduce( - (acc: any, curr: test_files_type, idx: number) => { - let arr = - (idx === 0) - ? [ - __dirname, - "..", - "fixtures", - "import-csv", - curr, - ] - : [ - TEMP_FOLDER, - ROOT_TEST_FOLDER, - (idx > 0 && idx < 4) ? VALID_TEST_FOLDER : USELESS_TEST_FOLDER, - curr, - ] - ; - acc[curr] = path.resolve(...arr); - return acc; - }, - {} + (acc: any, curr: test_files_type, idx: number) => { + let arr = + idx === 0 + ? [__dirname, '..', 'fixtures', 'import-csv', curr] + : [ + TEMP_FOLDER, + ROOT_TEST_FOLDER, + idx > 0 && idx < 4 ? VALID_TEST_FOLDER : USELESS_TEST_FOLDER, + curr, + ]; + acc[curr] = path.resolve(...arr); + return acc; + }, + {} ); // test scenarios for validations -const VALIDATIONS_SCENARIOS : [ - string, - [test_files_type, test_files_type, string[], ...string[]], - ...string[] +const VALIDATIONS_SCENARIOS: [ + string, + [test_files_type, test_files_type, string[], ...string[]], + ...string[] ][] = [ - [ - // Test out the message : "locales options doesn't contain uniq values" - 'Option locales - Duplicated values should be rejected', - [TEST_FILE_INPUT, TEST_FILE_COLUMNS, ["FR", "FR"]], - // I have to disable the error message check as yargs is buggy atm - //"doesn't contain uniq values" - ], - [ - // Test out the message : 'columns is not a JSON Object' - 'Option columns - unexpected file should be rejected', - [TEST_FILE_INPUT, TEST_FILE_EMPTY_ARRAY, ["FR", "NL"]], - "columns is not a JSON Object" - ], - [ - // Test out the message : `${missingProp} couldn't be found in columns object` - 'Option columns - missing property should be rejected', - [TEST_FILE_INPUT, TEST_FILE_EMPTY_OBJECT, ["FR", "NL"]], - "couldn't be found in columns object" - ], - [ - // Test out the message : "technical_key in columns object isn't a String" - 'Option columns - unexpected technical_key value should be reject', - [TEST_FILE_INPUT, TEST_FILE_COLUMNS_TKNS, ["FR", "NL"]], - "technical_key in columns object isn't a String" - ], - [ - // Test out the message : "locales key in columns object is not a JSON Object", - 'Option columns - unexpected locales value should be rejected', - [TEST_FILE_INPUT, TEST_FILE_COLUMNS_LNAO, ["FR", "NL"]], - "locales key in columns object is not a JSON Object" - ], - [ - // Test out the message : "At least one value for locales key in columns object isn't a string" - 'Option columns - unexpected value(s) for locales should be rejected', - [TEST_FILE_INPUT, TEST_FILE_COLUMNS_LVNS, ["FR", "NL"]] - ] + [ + // Test out the message : "locales options doesn't contain uniq values" + 'Option locales - Duplicated values should be rejected', + [TEST_FILE_INPUT, TEST_FILE_COLUMNS, ['FR', 'FR']], + // I have to disable the error message check as yargs is buggy atm + //"doesn't contain uniq values" + ], + [ + // Test out the message : 'columns is not a JSON Object' + 'Option columns - unexpected file should be rejected', + [TEST_FILE_INPUT, TEST_FILE_EMPTY_ARRAY, ['FR', 'NL']], + 'columns is not a JSON Object', + ], + [ + // Test out the message : `${missingProp} couldn't be found in columns object` + 'Option columns - missing property should be rejected', + [TEST_FILE_INPUT, TEST_FILE_EMPTY_OBJECT, ['FR', 'NL']], + "couldn't be found in columns object", + ], + [ + // Test out the message : "technical_key in columns object isn't a String" + 'Option columns - unexpected technical_key value should be reject', + [TEST_FILE_INPUT, TEST_FILE_COLUMNS_TKNS, ['FR', 'NL']], + "technical_key in columns object isn't a String", + ], + [ + // Test out the message : "locales key in columns object is not a JSON Object", + 'Option columns - unexpected locales value should be rejected', + [TEST_FILE_INPUT, TEST_FILE_COLUMNS_LNAO, ['FR', 'NL']], + 'locales key in columns object is not a JSON Object', + ], + [ + // Test out the message : "At least one value for locales key in columns object isn't a string" + 'Option columns - unexpected value(s) for locales should be rejected', + [TEST_FILE_INPUT, TEST_FILE_COLUMNS_LVNS, ['FR', 'NL']], + ], ]; // file structure for fsify, in order to run the tests @@ -204,13 +206,13 @@ const structure: fsify_structure = [ type: fsify.FILE, name: TEST_FILE_COLUMNS, contents: JSON.stringify({ - technical_key: "Technical Key", + technical_key: 'Technical Key', locales: { - "FR": "French translation", - "NL": "Dutch translation", - "DE": "German translation" - } - }) + FR: 'French translation', + NL: 'Dutch translation', + DE: 'German translation', + }, + }), }, // First format of settings.json (Path) { @@ -219,10 +221,10 @@ const structure: fsify_structure = [ contents: JSON.stringify({ input: TEST_FILES[TEST_FILE_INPUT], columns: TEST_FILES[TEST_FILE_COLUMNS], - locales: ["FR", "NL", "DE"], + locales: ['FR', 'NL', 'DE'], outputDir: path.resolve(TEMP_FOLDER, ROOT_TEST_FOLDER), - suffix: "_settings1" - }) + suffix: '_settings1', + }), }, // Second format of settings.json (Object/Array instead of Paths) { @@ -231,19 +233,19 @@ const structure: fsify_structure = [ contents: JSON.stringify({ input: TEST_FILES[TEST_FILE_INPUT], columns: { - technical_key: "Technical Key", + technical_key: 'Technical Key', locales: { - "FR": "French translation", - "NL": "Dutch translation", - "DE": "German translation" - } + FR: 'French translation', + NL: 'Dutch translation', + DE: 'German translation', + }, }, - locales: ["FR", "NL", "DE"], + locales: ['FR', 'NL', 'DE'], outputDir: path.resolve(TEMP_FOLDER, ROOT_TEST_FOLDER), - suffix: "_settings2" - }) + suffix: '_settings2', + }), }, - ] + ], }, // In this folder, files used for validations { @@ -268,34 +270,34 @@ const structure: fsify_structure = [ name: TEST_FILE_COLUMNS_TKNS, contents: JSON.stringify({ technical_key: 42.0, - locales: {} - }) - }, + locales: {}, + }), + }, // columns option - locales not a object { type: fsify.FILE, name: TEST_FILE_COLUMNS_LNAO, contents: JSON.stringify({ - technical_key: "something", - locales: [] - }) + technical_key: 'something', + locales: [], + }), }, // columns option - locales values not string { type: fsify.FILE, name: TEST_FILE_COLUMNS_LVNS, contents: JSON.stringify({ - technical_key: "something", + technical_key: 'something', locales: { - "FR": 42.0, - "NL": null - } - }) + FR: 42.0, + NL: null, + }, + }), }, - ] - } - ] - } + ], + }, + ], + }, ]; beforeAll(() => { @@ -304,87 +306,95 @@ beforeAll(() => { }); describe('[import_csv command]', () => { + describe('Check command availability', () => { + it('Should list from_csv in import command', async () => { + const output = await fetchOutput('import --help'); + expect(output).toMatch('from_csv'); + }); + + it('Should display from_csv help output', async () => { + const output = await fetchOutput('import from_csv --help'); + expect(output).toMatch(csv_description); + }); + }); + + describe('Validations', () => { + // mock console.log + let consoleLog: any; + beforeAll(() => { + consoleLog = jest.spyOn(console, 'log').mockImplementation(); + }); + + // restore console.log + afterAll(() => { + if (consoleLog !== undefined) { + consoleLog.mockRestore(); + } + }); + + test.each(VALIDATIONS_SCENARIOS)( + '%s', + async ( + _title: string, + args: [test_files_type, test_files_type, string[], ...string[]], + ...messages: string[] + ) => { + let [input, columns, locales, ...otherArgs] = args; + let test_cmd = concat_cmd([ + // mandatory args + ...prepare_mandatory_args( + TEST_FILES[input], + TEST_FILES[columns], + locales + ), + // optional args + ...otherArgs, + ]); + //console.warn(test_cmd); + // Test out if error message is thrown + await expectError(test_cmd, ...messages); + } + ); + }); - describe('Check command availability', () => { - it('Should list from_csv in import command', async () => { - const output = await fetchOutput('import --help'); - expect(output).toMatch('from_csv'); - }); - - it('Should display from_csv help output', async () => { - const output = await fetchOutput('import from_csv --help'); - expect(output).toMatch(csv_description); - }); + describe('E2E successful scenarios', () => { + // mock console.log + let consoleLog: any; + beforeAll(() => { + consoleLog = jest.spyOn(console, 'log').mockImplementation(); }); - describe('Validations', () => { - // mock console.log - let consoleLog: any; - beforeAll(() => { - consoleLog = jest.spyOn(console, 'log').mockImplementation(); - }); - - // restore console.log - afterAll(() => { - if (consoleLog !== undefined) { - consoleLog.mockRestore(); - } - }); - - test.each(VALIDATIONS_SCENARIOS)('%s', async (_title: string, args: [test_files_type, test_files_type, string[], ...string[]], ...messages: string[]) => { - let [input, columns, locales, ...otherArgs] = args; - let test_cmd = concat_cmd([ - // mandatory args - ...prepare_mandatory_args( - TEST_FILES[input], - TEST_FILES[columns], - locales - ), - // optional args - ...otherArgs, - ]); - //console.warn(test_cmd); - // Test out if error message is thrown - await expectError(test_cmd, ...messages); - }); - }); - - describe('E2E successful scenarios', () => { - // mock console.log - let consoleLog: any; - beforeAll(() => { - consoleLog = jest.spyOn(console, 'log').mockImplementation(); - }); - - // clear mock after each call - afterEach(() => { - consoleLog.mockClear(); - }); - - // reenable console.log - afterAll(() => { - // restore console.log - if (consoleLog !== undefined) { - consoleLog.mockRestore(); - } - }); - - test.each([ - ['(Paths)', TEST_FILE_SETTINGS1], - ['(Object/Array instead of Paths)', TEST_FILE_SETTINGS2], - ])( - 'settings.json %s', - async (_title: string, settingsFile: test_files_type) => { - let test_cmd = concat_cmd([ - '--settings', - `"${TEST_FILES[settingsFile]}"`, - ]); - // run command - //console.warn(test_cmd); - await parser.parseAsync(test_cmd); - - expect(consoleLog).toHaveBeenCalledWith('Successfully exported found locale(s) to i18n json file(s)'); - } + // clear mock after each call + afterEach(() => { + consoleLog.mockClear(); + }); + + // reenable console.log + afterAll(() => { + // restore console.log + if (consoleLog !== undefined) { + consoleLog.mockRestore(); + } + }); + + test.each([ + ['(Paths)', TEST_FILE_SETTINGS1], + ['(Object/Array instead of Paths)', TEST_FILE_SETTINGS2], + ])( + 'settings.json %s', + async (_title: string, settingsFile: test_files_type) => { + let test_cmd = concat_cmd([ + '--settings', + `"${TEST_FILES[settingsFile]}"`, + ]); + // run command + //console.warn(test_cmd); + await parser.parseAsync(test_cmd); + + expect(consoleLog).toHaveBeenCalledWith( + 'Successfully exported found locale(s) to i18n json file(s)' ); - }); -}); \ No newline at end of file + } + ); + }); +}); diff --git a/test/import/import-xlsx.test.ts b/test/import/import-xlsx.test.ts index 6a139e8..124bb5b 100644 --- a/test/import/import-xlsx.test.ts +++ b/test/import/import-xlsx.test.ts @@ -15,8 +15,8 @@ const TEMP_FOLDER = os.tmpdir(); // test folders constants const ROOT_TEST_FOLDER = 'tests-for-import-xlsx'; const [VALID_TEST_FOLDER, USELESS_TEST_FOLDER] = [ - 'correct', // folder where every file are correct - 'useless', // folder where file has an useless content + 'correct', // folder where every file are correct + 'useless', // folder where file has an useless content ]; // initialise fsify @@ -36,16 +36,25 @@ const parser = yargs.command(command, describeText, builder).help(); // to concat faster command type concat_cmd_type = (args: string[]) => string; -type prepare_mandatory_args_type = (...args: [string, string, string[]]) => string[]; +type prepare_mandatory_args_type = ( + ...args: [string, string, string[]] +) => string[]; const concat_cmd: concat_cmd_type = (args: string[]) => `import from_xlsx ${args.join(' ')}`; const prepare_mandatory_args: prepare_mandatory_args_type = ( ...[input, columns, ...locales] -) => ['--input', `"${input}"`, '--columns', `"${columns}"`, '--locales', locales.join(' ')]; +) => [ + '--input', + `"${input}"`, + '--columns', + `"${columns}"`, + '--locales', + locales.join(' '), +]; // return the output of a given command to the parser function fetchOutput(cmd: string): Promise { - return new Promise(resolve => { + return new Promise((resolve) => { parser.parse(cmd, (_err: Error | undefined, _argv: any, output: string) => { resolve(output); }); @@ -54,130 +63,125 @@ function fetchOutput(cmd: string): Promise { // makes assertions on errors async function expectError(cmd: string, ...messages: string[]) { - // error to be retrieve - let error: any = undefined; - // In tests, I had to make sure yargs doesn't override error for the following reason : - // Even when validation failed, it somehow can go to handler() - let isFirstError = true; - - // add fail() handler - // Because of problem explained above, I had to ignore if an error occurs afterwards - try { - await parser + // error to be retrieve + let error: any = undefined; + // In tests, I had to make sure yargs doesn't override error for the following reason : + // Even when validation failed, it somehow can go to handler() + let isFirstError = true; + + // add fail() handler + // Because of problem explained above, I had to ignore if an error occurs afterwards + try { + await parser .fail((_, e) => { if (isFirstError) { isFirstError = false; error = e; } }) - .parseAsync(cmd); - } catch (_) {} - // check if error was set - expect(error).not.toEqual(undefined); - // check if it is an error Object - expect(error).toHaveProperty('message'); - // check if error message contains expected element - for (let expectedStr of messages) { - expect((error as Error).message).toMatch(expectedStr); - } + .parseAsync(cmd); + } catch (_) {} + // check if error was set + expect(error).not.toEqual(undefined); + // check if it is an error Object + expect(error).toHaveProperty('message'); + // check if error message contains expected element + for (let expectedStr of messages) { + expect((error as Error).message).toMatch(expectedStr); + } } // to access easier the paths of test file paths const test_files_list = [ - // inpput file - 'export-xlsx.xlsx', - // correct files - 'columns.json', - 'settings1.json', - 'settings2.json', - // wrong files - 'emptyObject.json', - 'emptyArray.json', - // wrong columns.json - 'columns-technicalKeyNotString.json', - 'columns-localesNotAObject.json', - 'columns-localesValuesNotString.json' + // inpput file + 'export-xlsx.xlsx', + // correct files + 'columns.json', + 'settings1.json', + 'settings2.json', + 'settings3.js', + // wrong files + 'emptyObject.json', + 'emptyArray.json', + // wrong columns.json + 'columns-technicalKeyNotString.json', + 'columns-localesNotAObject.json', + 'columns-localesValuesNotString.json', ] as const; const [ - TEST_FILE_INPUT, - TEST_FILE_COLUMNS, - TEST_FILE_SETTINGS1, - TEST_FILE_SETTINGS2, - TEST_FILE_EMPTY_OBJECT, - TEST_FILE_EMPTY_ARRAY, - TEST_FILE_COLUMNS_TKNS, - TEST_FILE_COLUMNS_LNAO, - TEST_FILE_COLUMNS_LVNS + TEST_FILE_INPUT, + TEST_FILE_COLUMNS, + TEST_FILE_SETTINGS1, + TEST_FILE_SETTINGS2, + TEST_FILE_SETTINGS3, + TEST_FILE_EMPTY_OBJECT, + TEST_FILE_EMPTY_ARRAY, + TEST_FILE_COLUMNS_TKNS, + TEST_FILE_COLUMNS_LNAO, + TEST_FILE_COLUMNS_LVNS, ] = test_files_list; type test_files_type = typeof test_files_list[number]; // files path const TEST_FILES: { [x in test_files_type]: string } = test_files_list.reduce( - (acc: any, curr: test_files_type, idx: number) => { - let arr = - (idx === 0) - ? [ - __dirname, - "..", - "fixtures", - "import-xlsx", - curr, - ] - : [ - TEMP_FOLDER, - ROOT_TEST_FOLDER, - (idx > 0 && idx < 4) ? VALID_TEST_FOLDER : USELESS_TEST_FOLDER, - curr, - ] - ; - acc[curr] = path.resolve(...arr); - return acc; - }, - {} + (acc: any, curr: test_files_type, idx: number) => { + let arr = + idx === 0 + ? [__dirname, '..', 'fixtures', 'import-xlsx', curr] + : [ + TEMP_FOLDER, + ROOT_TEST_FOLDER, + idx > 0 && idx < 5 ? VALID_TEST_FOLDER : USELESS_TEST_FOLDER, + curr, + ]; + acc[curr] = path.resolve(...arr); + return acc; + }, + {} ); // test scenarios for validations -const VALIDATIONS_SCENARIOS : [ - string, - [test_files_type, test_files_type, string[], ...string[]], - ...string[] +const VALIDATIONS_SCENARIOS: [ + string, + [test_files_type, test_files_type, string[], ...string[]], + ...string[] ][] = [ - [ - // Test out the message : "locales options doesn't contain uniq values" - 'Option locales - Duplicated values should be rejected', - [TEST_FILE_INPUT, TEST_FILE_COLUMNS, ["FR", "FR"]], - // I have to disable the error message check as yargs is buggy atm - //"doesn't contain uniq values" - ], - [ - // Test out the message : 'columns is not a JSON Object' - 'Option columns - unexpected file should be rejected', - [TEST_FILE_INPUT, TEST_FILE_EMPTY_ARRAY, ["FR", "NL"]], - "columns is not a JSON Object" - ], - [ - // Test out the message : `${missingProp} couldn't be found in columns object` - 'Option columns - missing property should be rejected', - [TEST_FILE_INPUT, TEST_FILE_EMPTY_OBJECT, ["FR", "NL"]], - "couldn't be found in columns object" - ], - [ - // Test out the message : "technical_key in columns object isn't a String" - 'Option columns - unexpected technical_key value should be reject', - [TEST_FILE_INPUT, TEST_FILE_COLUMNS_TKNS, ["FR", "NL"]], - "technical_key in columns object isn't a String" - ], - [ - // Test out the message : "locales key in columns object is not a JSON Object", - 'Option columns - unexpected locales value should be rejected', - [TEST_FILE_INPUT, TEST_FILE_COLUMNS_LNAO, ["FR", "NL"]], - "locales key in columns object is not a JSON Object" - ], - [ - // Test out the message : "At least one value for locales key in columns object isn't a string" - 'Option columns - unexpected value(s) for locales should be rejected', - [TEST_FILE_INPUT, TEST_FILE_COLUMNS_LVNS, ["FR", "NL"]] - ] + [ + // Test out the message : "locales options doesn't contain uniq values" + 'Option locales - Duplicated values should be rejected', + [TEST_FILE_INPUT, TEST_FILE_COLUMNS, ['FR', 'FR']], + // I have to disable the error message check as yargs is buggy atm + //"doesn't contain uniq values" + ], + [ + // Test out the message : 'columns is not a JSON Object' + 'Option columns - unexpected file should be rejected', + [TEST_FILE_INPUT, TEST_FILE_EMPTY_ARRAY, ['FR', 'NL']], + 'columns is not a JSON Object', + ], + [ + // Test out the message : `${missingProp} couldn't be found in columns object` + 'Option columns - missing property should be rejected', + [TEST_FILE_INPUT, TEST_FILE_EMPTY_OBJECT, ['FR', 'NL']], + "couldn't be found in columns object", + ], + [ + // Test out the message : "technical_key in columns object isn't a String" + 'Option columns - unexpected technical_key value should be reject', + [TEST_FILE_INPUT, TEST_FILE_COLUMNS_TKNS, ['FR', 'NL']], + "technical_key in columns object isn't a String", + ], + [ + // Test out the message : "locales key in columns object is not a JSON Object", + 'Option columns - unexpected locales value should be rejected', + [TEST_FILE_INPUT, TEST_FILE_COLUMNS_LNAO, ['FR', 'NL']], + 'locales key in columns object is not a JSON Object', + ], + [ + // Test out the message : "At least one value for locales key in columns object isn't a string" + 'Option columns - unexpected value(s) for locales should be rejected', + [TEST_FILE_INPUT, TEST_FILE_COLUMNS_LVNS, ['FR', 'NL']], + ], ]; // file structure for fsify, in order to run the tests @@ -204,13 +208,13 @@ const structure: fsify_structure = [ type: fsify.FILE, name: TEST_FILE_COLUMNS, contents: JSON.stringify({ - technical_key: "Technical Key", + technical_key: 'Technical Key', locales: { - "FR": "French translation", - "NL": "Dutch translation", - "DE": "German translation" - } - }) + FR: 'French translation', + NL: 'Dutch translation', + DE: 'German translation', + }, + }), }, // First format of settings.json (Path) { @@ -219,10 +223,10 @@ const structure: fsify_structure = [ contents: JSON.stringify({ input: TEST_FILES[TEST_FILE_INPUT], columns: TEST_FILES[TEST_FILE_COLUMNS], - locales: ["FR", "NL", "DE"], + locales: ['FR', 'NL', 'DE'], outputDir: path.resolve(TEMP_FOLDER, ROOT_TEST_FOLDER), - suffix: "_settings1" - }) + suffix: '_settings1', + }), }, // Second format of settings.json (Object/Array instead of Paths) { @@ -231,19 +235,39 @@ const structure: fsify_structure = [ contents: JSON.stringify({ input: TEST_FILES[TEST_FILE_INPUT], columns: { - technical_key: "Technical Key", + technical_key: 'Technical Key', locales: { - "FR": "French translation", - "NL": "Dutch translation", - "DE": "German translation" - } + FR: 'French translation', + NL: 'Dutch translation', + DE: 'German translation', + }, }, - locales: ["FR", "NL", "DE"], + locales: ['FR', 'NL', 'DE'], outputDir: path.resolve(TEMP_FOLDER, ROOT_TEST_FOLDER), - suffix: "_settings2" - }) + suffix: '_settings2', + }), }, - ] + // First format of settings.js (Mixins config) + { + type: fsify.FILE, + name: TEST_FILE_SETTINGS3, + // As fsify uses fs.writeFile, we need to double backslash stuff again + contents: `module.exports = { + "input": "${TEST_FILES[TEST_FILE_INPUT].replace(/\\/g, '\\\\')}", + "columns": { + "technical_key": 'Technical Key', + "locales": { + "FR": 'French translation', + "NL": 'Dutch translation', + "DE": 'German translation' + } + }, + "locales": ['FR', 'NL', 'DE'], + "outputDir": "${TEMP_FOLDER.replace(/\\/g, '\\\\')}", + "suffix": '_settings3', + }`, + }, + ], }, // In this folder, files used for validations { @@ -268,34 +292,34 @@ const structure: fsify_structure = [ name: TEST_FILE_COLUMNS_TKNS, contents: JSON.stringify({ technical_key: 42.0, - locales: {} - }) - }, + locales: {}, + }), + }, // columns option - locales not a object { type: fsify.FILE, name: TEST_FILE_COLUMNS_LNAO, contents: JSON.stringify({ - technical_key: "something", - locales: [] - }) + technical_key: 'something', + locales: [], + }), }, // columns option - locales values not string { type: fsify.FILE, name: TEST_FILE_COLUMNS_LVNS, contents: JSON.stringify({ - technical_key: "something", + technical_key: 'something', locales: { - "FR": 42.0, - "NL": null - } - }) + FR: 42.0, + NL: null, + }, + }), }, - ] - } - ] - } + ], + }, + ], + }, ]; beforeAll(() => { @@ -304,87 +328,93 @@ beforeAll(() => { }); describe('[import_xlsx command]', () => { + describe('Check command availability', () => { + it('Should list from_xlsx in import command', async () => { + const output = await fetchOutput('import --help'); + expect(output).toMatch('from_xlsx'); + }); + + it('Should display from_xlsx help output', async () => { + const output = await fetchOutput('import from_xlsx --help'); + expect(output).toMatch(xlsx_description); + }); + }); - describe('Check command availability', () => { - it('Should list from_xlsx in import command', async () => { - const output = await fetchOutput('import --help'); - expect(output).toMatch('from_xlsx'); - }); - - it('Should display from_xlsx help output', async () => { - const output = await fetchOutput('import from_xlsx --help'); - expect(output).toMatch(xlsx_description); - }); + describe('Validations', () => { + // mock console.log + let consoleLog: any; + beforeAll(() => { + consoleLog = jest.spyOn(console, 'log').mockImplementation(); }); - describe('Validations', () => { - // mock console.log - let consoleLog: any; - beforeAll(() => { - consoleLog = jest.spyOn(console, 'log').mockImplementation(); - }); - - // restore console.log - afterAll(() => { - if (consoleLog !== undefined) { - consoleLog.mockRestore(); - } - }); - - test.each(VALIDATIONS_SCENARIOS)('%s', async (_title: string, args: [test_files_type, test_files_type, string[], ...string[]], ...messages: string[]) => { - let [input, columns, locales, ...otherArgs] = args; - let test_cmd = concat_cmd([ - // mandatory args - ...prepare_mandatory_args( - TEST_FILES[input], - TEST_FILES[columns], - locales - ), - // optional args - ...otherArgs, - ]); - //console.warn(test_cmd); - // Test out if error message is thrown - await expectError(test_cmd, ...messages); - }); - }); - - describe('E2E successful scenarios', () => { - // mock console.log - let consoleLog: any; - beforeAll(() => { - consoleLog = jest.spyOn(console, 'log').mockImplementation(); - }); - - // clear mock after each call - afterEach(() => { - consoleLog.mockClear(); - }); - - // reenable console.log - afterAll(() => { - // restore console.log - if (consoleLog !== undefined) { - consoleLog.mockRestore(); - } - }); - - test.each([ - ['(Paths)', TEST_FILE_SETTINGS1], - ['(Object/Array instead of Paths)', TEST_FILE_SETTINGS2], - ])( - 'settings.json %s', - async (_title: string, settingsFile: test_files_type) => { - let test_cmd = concat_cmd([ - '--settings', - `"${TEST_FILES[settingsFile]}"`, - ]); - // run command - //console.warn(test_cmd); - await parser.parseAsync(test_cmd); - - expect(consoleLog).toHaveBeenCalledWith('Successfully exported found locale(s) to i18n json file(s)'); - } - ); - }); -}); \ No newline at end of file + // restore console.log + afterAll(() => { + if (consoleLog !== undefined) { + consoleLog.mockRestore(); + } + }); + + test.each(VALIDATIONS_SCENARIOS)( + '%s', + async ( + _title: string, + args: [test_files_type, test_files_type, string[], ...string[]], + ...messages: string[] + ) => { + let [input, columns, locales, ...otherArgs] = args; + let test_cmd = concat_cmd([ + // mandatory args + ...prepare_mandatory_args( + TEST_FILES[input], + TEST_FILES[columns], + locales + ), + // optional args + ...otherArgs, + ]); + //console.warn(test_cmd); + // Test out if error message is thrown + await expectError(test_cmd, ...messages); + } + ); + }); + + describe('E2E successful scenarios', () => { + // mock console.log + let consoleLog: any; + beforeAll(() => { + consoleLog = jest.spyOn(console, 'log').mockImplementation(); + }); + + // clear mock after each call + afterEach(() => { + consoleLog.mockClear(); + }); + + // reenable console.log + afterAll(() => { + // restore console.log + if (consoleLog !== undefined) { + consoleLog.mockRestore(); + } + }); + + test.each([ + ['(Paths)', TEST_FILE_SETTINGS1], + ['(Object/Array instead of Paths)', TEST_FILE_SETTINGS2], + ['should work with js config file', TEST_FILE_SETTINGS3], + ])('settings %s', async (_title: string, settingsFile: test_files_type) => { + let test_cmd = concat_cmd([ + '--settings', + `"${TEST_FILES[settingsFile]}"`, + ]); + // run command + //console.warn(test_cmd); + await parser.parseAsync(test_cmd); + + expect(consoleLog).toHaveBeenCalledWith( + 'Successfully exported found locale(s) to i18n json file(s)' + ); + }); + }); +}); diff --git a/website/docs/commands/diff.mdx b/website/docs/commands/diff.mdx index ebf85a9..a7f3272 100644 --- a/website/docs/commands/diff.mdx +++ b/website/docs/commands/diff.mdx @@ -218,6 +218,7 @@ This command generates a report (in JSON by default) that shows change(s) betwee values={[ { label: 'With two files', value: 'settings1', }, { label: 'With three files', value: 'settings2', }, + { label: 'Settings.js', value: 'settings3', }, ] }> @@ -262,4 +263,23 @@ npx @jy95/i18n-tools diff --settings "/absolutePath/to/settings2.json" + + +```bash +npx @jy95/i18n-tools diff --settings "/absolutePath/to/settings3.js" +``` + +```js title="settings3.js" +module.exports = { + "filename":"diff_settings3-JSON", + "outputDir":"D:\\TEMP\\TEMP", + "outputFormat":"JSON", + "files":[ + "D:\\TEMP\\fr_v0.json", + "D:\\TEMP\\fr_v1.json" + ] +} +``` + + \ No newline at end of file diff --git a/website/docs/commands/export/export to_csv.mdx b/website/docs/commands/export/export to_csv.mdx index a3cd2e4..8d8ca1b 100644 --- a/website/docs/commands/export/export to_csv.mdx +++ b/website/docs/commands/export/export to_csv.mdx @@ -136,7 +136,8 @@ simpleKey;[FR] not setted key;[NL] not setted key;[DE] not setted key defaultValue="settings1" values={[ { label: 'Paths', value: 'settings1', }, - { label: 'Objects/Arrays', value: 'settings2', } + { label: 'Objects/Arrays', value: 'settings2', }, + { label: 'Settings.js', value: 'settings3', } ] }> @@ -214,4 +215,30 @@ npx @jy95/i18n-tools export to_csv --settings "/absolutePath/to/settings2.json" ``` + + +```bash +npx @jy95/i18n-tools export to_csv --settings "/absolutePath/to/settings3.js" +``` + +```js title="settings3.js" +module.exports = { + files: ["fr", "nl", "de"].reduce( + (prev, curr) => + Object.assign(prev, { + [curr.toUpperCase()]: `D:\\TEMP\\TEMP\\tests-for-export\\correct\\${curr}.json`, + }), + {} + ), + columns: [ + ["FR", "French translation"], + ["NL", "Dutch translation"], + ["DE", "German translation"], + ].map(([locale, label]) => ({ locale: locale, label: label })), + filename: "settings3-output", + outputDir: "D:\\TEMP\\TEMP" +}; +``` + + \ No newline at end of file diff --git a/website/docs/commands/export/export to_xlsx.mdx b/website/docs/commands/export/export to_xlsx.mdx index 21694e7..23f5311 100644 --- a/website/docs/commands/export/export to_xlsx.mdx +++ b/website/docs/commands/export/export to_xlsx.mdx @@ -126,6 +126,7 @@ This command helps you to turn them into a single xlsx file such as [this one](. { label: 'Paths', value: 'settings1', }, { label: 'Objects/Arrays', value: 'settings2', }, { label: 'Customize xlsx file', value: 'settings3', }, + { label: 'Settings.js', value: 'settings4', }, ] }> @@ -320,4 +321,110 @@ module.exports = async function(worksheet /*: Worksheet*/) { }; ``` + + + +```bash +npx @jy95/i18n-tools export to_xlsx --settings "/absolutePath/to/settings4.js" +``` + +```js title="settings4.js" +// I keep in comments the stuff needed for the typings +// (So I can easily update this script in the future) +//import { Worksheet } from "exceljs"; + +module.exports = { + files2: ["fr", "nl", "de"].reduce( + (prev, curr) => + Object.assign(prev, { + [curr.toUpperCase()]: `D:\\TEMP\\TEMP\\tests-for-export\\correct\\${curr}.json`, + }), + {} + ), + columns: [ + ["FR", "French translation"], + ["NL", "Dutch translation"], + ["DE", "German translation"], + ].map(([locale, label]) => ({ locale: locale, label: label })), + worksheetCustomizer: async function (worksheet /*: Worksheet*/) { + // Conditionaly formatting (to better view stuff) + let rowCount = worksheet.rowCount; + let columnCount = worksheet.columnCount; + + // for easiness in the future, for arbitrary number of translations + // As table have a least one language (starting to 'B'), pretty simple to compute last column letter + let lastColumnLetter = String.fromCharCode(66 + (columnCount - 2)); + + // domain for rules ; All the cells + // Ex : "B2:D" + rowCount + 2" for three languages + let computedRef = `B2:${lastColumnLetter + rowCount + 2}`; + + worksheet.addConditionalFormatting({ + ref: computedRef, + rules: [ + // cell is empty : put it in red + { + type: "containsText", + operator: "containsBlanks", + style: { + fill: { + type: "pattern", + pattern: "solid", + bgColor: { argb: "FF5733" }, + }, + }, + priority: 1, + }, + // cell contains either [FR], [NL] or [DE] : put it in orange + { + type: "containsText", + operator: "containsText", + text: "[FR]", + style: { + fill: { + type: "pattern", + pattern: "solid", + bgColor: { argb: "FF9633" }, + }, + }, + priority: 2, + }, + { + type: "containsText", + operator: "containsText", + text: "[NL]", + style: { + fill: { + type: "pattern", + pattern: "solid", + bgColor: { argb: "FF9633" }, + }, + }, + priority: 2, + }, + { + type: "containsText", + operator: "containsText", + text: "[DE]", + style: { + fill: { + type: "pattern", + pattern: "solid", + bgColor: { argb: "FF9633" }, + }, + }, + priority: 2, + }, + ], + }); + return worksheet; + }, + worksheetName: "Settings 4 - Worksheet", + filename: "settings4-output", + outputDir: "D:\\TEMP\\TEMP" +}; +``` + + + \ No newline at end of file diff --git a/website/docs/commands/import/import from_csv.mdx b/website/docs/commands/import/import from_csv.mdx index 59e442a..0e9240b 100644 --- a/website/docs/commands/import/import from_csv.mdx +++ b/website/docs/commands/import/import from_csv.mdx @@ -137,6 +137,7 @@ This command helps you to turn this into several i18n json files : values={[ { label: 'Paths', value: 'settings1', }, { label: 'Objects/Arrays', value: 'settings2', }, + { label: 'Settings.js', value: 'settings3', }, ] }> @@ -202,4 +203,34 @@ npx @jy95/i18n-tools import from_csv --settings "/absolutePath/to/settings2.json + + +```bash +npx @jy95/i18n-tools import from_csv --settings "/absolutePath/to/settings3.js" +``` + +```js title="settings3.js" +module.exports = { + input: "D:\\workspace\\i18n-tools\\test\\fixtures\\import-csv\\export-csv.csv", + columns: { + technical_key: "Technical Key", + locales: [ + ["FR", "French translation"], + ["NL", "Dutch translation"], + ["DE", "German translation"], + ].reduce( + (prev, [locale, label]) => + Object.assign(prev, { + [locale]: label, + }), + {} + ), + }, + locales: ["FR", "NL", "DE"], + outputDir: "D:\\TEMP\\TEMP\\tests-for-import", + suffix: "_settings3", +}; +``` + + \ No newline at end of file diff --git a/website/docs/commands/import/import from_xlsx.mdx b/website/docs/commands/import/import from_xlsx.mdx index b25ee40..edb3e59 100644 --- a/website/docs/commands/import/import from_xlsx.mdx +++ b/website/docs/commands/import/import from_xlsx.mdx @@ -125,6 +125,7 @@ This command helps you to turn this into several i18n json files : values={[ { label: 'Paths', value: 'settings1', }, { label: 'Objects/Arrays', value: 'settings2', }, + { label: 'Settings.js', value: 'settings3', }, ] }> @@ -190,4 +191,34 @@ npx @jy95/i18n-tools import from_xlsx --settings "/absolutePath/to/settings2.jso + + +```bash +npx @jy95/i18n-tools import from_xlsx --settings "/absolutePath/to/settings3.js" +``` + +```js title="settings3.js" +module.exports = { + input: "D:\\workspace\\i18n-tools\\test\\fixtures\\import-xlsx\\export-xlsx.xlsx", + columns: { + technical_key: "Technical Key", + locales: [ + ["FR", "French translation"], + ["NL", "Dutch translation"], + ["DE", "German translation"], + ].reduce( + (prev, [locale, label]) => + Object.assign(prev, { + [locale]: label, + }), + {} + ), + }, + locales: ["FR", "NL", "DE"], + outputDir: "D:\\TEMP\\TEMP\\tests-for-import", + suffix: "_settings3", +}; +``` + + \ No newline at end of file diff --git a/website/docusaurus.config.js b/website/docusaurus.config.js index fc13fbc..4b97678 100644 --- a/website/docusaurus.config.js +++ b/website/docusaurus.config.js @@ -41,6 +41,10 @@ const darkCodeTheme = require('prism-react-renderer/themes/dracula'); themeConfig: /** @type {import('@docusaurus/preset-classic').ThemeConfig} */ ({ + algolia: { + apiKey: 'acdb5b6213c60a6b80aaab39fd727035', + indexName: 'i18n-tool' + }, navbar: { title: '@jy95/i18n-tools', logo: { diff --git a/website/package-lock.json b/website/package-lock.json index 9599076..3c33e0c 100644 --- a/website/package-lock.json +++ b/website/package-lock.json @@ -2167,9 +2167,9 @@ } }, "@types/react-router-dom": { - "version": "5.1.8", - "resolved": "https://registry.npmjs.org/@types/react-router-dom/-/react-router-dom-5.1.8.tgz", - "integrity": "sha512-03xHyncBzG0PmDmf8pf3rehtjY0NpUj7TIN46FrT5n1ZWHPZvXz32gUyNboJ+xsL8cpg8bQVLcllptcQHvocrw==", + "version": "5.1.9", + "resolved": "https://registry.npmjs.org/@types/react-router-dom/-/react-router-dom-5.1.9.tgz", + "integrity": "sha512-Go0vxZSigXTyXx8xPkGiBrrc3YbBs82KE14WENMLS6TSUKcRFSmYVbL19zFOnNFqJhqrPqEs2h5eUpJhSRrwZw==", "dev": true, "requires": { "@types/history": "*", @@ -10108,9 +10108,9 @@ } }, "typescript": { - "version": "4.4.2", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.2.tgz", - "integrity": "sha512-gzP+t5W4hdy4c+68bfcv0t400HVJMMd2+H9B7gae1nQlBzCqvrXX+6GL/b3GAgyTH966pzrZ70/fRjwAtZksSQ==", + "version": "4.4.3", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-4.4.3.tgz", + "integrity": "sha512-4xfscpisVgqqDfPaJo5vkd+Qd/ItkoagnHpufr+i2QCHBsNYp+G7UAoyFl8aPtx879u38wPV65rZ8qbGZijalA==", "dev": true }, "ua-parser-js": { diff --git a/website/package.json b/website/package.json index e7da9b6..d52bd9f 100644 --- a/website/package.json +++ b/website/package.json @@ -31,8 +31,8 @@ "@tsconfig/docusaurus": "^1.0.4", "@types/react": "^17.0.14", "@types/react-helmet": "^6.1.2", - "@types/react-router-dom": "^5.1.8", - "typescript": "^4.3.5" + "@types/react-router-dom": "^5.1.9", + "typescript": "^4.4.3" }, "browserslist": { "production": [