bump version

chore(deps): bump y18n from 4.0.0 to 4.0.1

CHANGELOG.md

@@ -1,5 +1,22 @@
 ### Changelog
 
+#### [v0.2.0](https://github.com/node-ebics/node-ebics-client/compare/v0.1.7...v0.2.0)
+
+> 30 March 2021
+
+- chore(deps): bump y18n from 4.0.0 to 4.0.1 [`#56`](https://github.com/node-ebics/node-ebics-client/pull/56)
+- Add additional bank configuration items [`#53`](https://github.com/node-ebics/node-ebics-client/pull/53)
+- chore(deps): bump xmldom from 0.3.0 to 0.5.0 [`#46`](https://github.com/node-ebics/node-ebics-client/pull/46)
+- Cryto.js: Nasty workaround for incorrect signature (257 vs 256) and h… [`#50`](https://github.com/node-ebics/node-ebics-client/pull/50)
+- Examples: Improve config implementation for multibank [`#51`](https://github.com/node-ebics/node-ebics-client/pull/51)
+- README.md: Add J.P. Morgan to tested banks [`#55`](https://github.com/node-ebics/node-ebics-client/pull/55)
+- Add support for Bank GPB AO (Gazprombank Russia) [`#49`](https://github.com/node-ebics/node-ebics-client/pull/49)
+- Add sample code for zipped CAMT statements [`#48`](https://github.com/node-ebics/node-ebics-client/pull/48)
+
+- chore: cleanup & bump [`f9fb6d3`](https://github.com/node-ebics/node-ebics-client/commit/f9fb6d3dc94c27a0c983205ce0ef00e4a18f95ff)
+- merge [`2d580c0`](https://github.com/node-ebics/node-ebics-client/commit/2d580c0d443b0ec0d103a94b64c803bfa1dd6b0b)
+- chore: update deps [`e642024`](https://github.com/node-ebics/node-ebics-client/commit/e6420244dc5d218926ede3b0123897096fb6dfd9)
+
 #### [v0.1.7](https://github.com/node-ebics/node-ebics-client/compare/v0.1.6...v0.1.7)
 
 > 5 February 2021
@@ -8,8 +25,8 @@
 - chore(deps): bump lodash from 4.17.15 to 4.17.19 [`#39`](https://github.com/node-ebics/node-ebics-client/pull/39)
 
 - chore: fix dev dependencies voulnarbilities [`d5a24f9`](https://github.com/node-ebics/node-ebics-client/commit/d5a24f9537f676ded8d1996928ed7e76b7b9ba3f)
+- changelog [`a998538`](https://github.com/node-ebics/node-ebics-client/commit/a998538316c963896c0e7ca76002513f9ea4a01a)
 - chore: changelog [`a9bbdd9`](https://github.com/node-ebics/node-ebics-client/commit/a9bbdd95c6ce0fdb9cac5452af6fedb4f04b10cb)
-- chore: bump [`b44ff0f`](https://github.com/node-ebics/node-ebics-client/commit/b44ff0f44cd3e88bb6cf278b8d1771f104a8367d)
 
 #### [v0.1.6](https://github.com/node-ebics/node-ebics-client/compare/v0.1.4...v0.1.6)
 

README.md

@@ -28,6 +28,8 @@ The client is currently tested and verified to work with the following banks:
 * [Raiffeisen Schweiz](https://www.raiffeisen.ch/rch/de.html)
 * [BW Bank](https://www.bw-bank.de/de/home.html)
 * [Bank GPB International S.A.](https://gazprombank.lu/e-banking)
+* [Bank GPB AO](https://gazprombank.ru/)
+* [J.P. Morgan](https://www.jpmorgan.com/)
 
 
 ## Inspiration
@@ -37,6 +39,6 @@ The basic concept of this library was inspired by the [EPICS](https://github.com
 
 ## Copyright
 
-Copyright: eCollect AG, 2018-9.  
+Copyright: Dimitar Nanov, 2019-2021.  
 Licensed under the [GPLv3](LICENSE) license.
 

examples/bankLetter.js

@@ -9,10 +9,9 @@ const os = require('os');
 
 const config = require('./loadConfig')();
 const client = require('./getClient')(config);
-const bankName = config.bankName;
-const languageCode = config.languageCode;
-const template = fs.readFileSync('../templates/ini_'+config.languageCode+'.hbs', { encoding: 'utf8 '});
-const bankLetterFile = path.join(os.homedir(), 'bankLetter_'+languageCode+'.html');
+const bankName = client.bankName;
+const template = fs.readFileSync("../templates/ini_"+client.languageCode+".hbs", { encoding: 'utf8'});
+const bankLetterFile = path.join("./", "bankLetter_"+client.bankShortName+"_"+client.languageCode+".html");
 
 const letter = new ebics.BankLetter({ client, bankName, template });
 

examples/config/config.json

@@ -5,6 +5,8 @@
 	"hostId": "MyHostIdTest",
 	"passphrase": "MyPasswordTest",
 	"keyStoragePath": "./keys-test",
-	"bankName":"Test Bank",
-	"languageCode":"en"
+	"bankName":"Test Bank Full Name",
+	"bankShortName":"TESTBANKSHORT",
+	"languageCode":"en",
+	"storageLocation":"\\\\myserver\\Share\\Folder\\BankName\\Test\\"
 }

examples/config/config.production.testbank.json

@@ -5,6 +5,8 @@
 	"hostId": "MyHostIdProduction",
 	"passphrase": "MyPasswordProduction",
 	"keyStoragePath": "./keys-prod",
-	"bankName":"Production Bank",
-	"languageCode":"en"
+	"bankName":"Production Bank Full Name",
+	"bankShortName":"PRODBANKSHORT",
+	"languageCode":"en",
+	"storageLocation":"\\\\myserver\\Share\\Folder\\BankName\\Production\\"
 }

examples/config/config.production.testbank.testentity.json

@@ -0,0 +1,12 @@
+{
+	"url": "https://ebics.server",
+	"partnerId": "EBICS ParnerID Production",
+	"userId": "MyUserIdProduction",
+	"hostId": "MyHostIdProduction",
+	"passphrase": "MyPasswordProduction",
+	"keyStoragePath": "./keys-prod",
+	"bankName":"Production Bank Full Name",
+	"bankShortName":"PRODBANKSHORT",
+	"languageCode":"en",
+	"storageLocation":"\\\\myserver\\Share\\Folder\\BankName\\Production\\"
+}

examples/loadConfig.js

@@ -20,11 +20,22 @@ const getDefaultEnv = () => {
 	return parArg || process.env.NODE_ENV;
 }
 
-const loadConfig = (configDirectory = path.join(__dirname, './config'), env = getDefaultEnv()) => {
-	console.log(`Loading config form ${configDirectory} with env set to ${env}.`);
+const getBankIdentifier = () => {
+	const [,,,parArg] = process.argv;
+	return parArg || "testbank";
+}
 
+const getEntityIdentifier = () => {
+	const [,,,,parArg] = process.argv;
+	return parArg || ""
+}
+
+const loadConfig = (configDirectory = path.join(__dirname, './config'), env = getDefaultEnv(), bank = getBankIdentifier(), entity = getEntityIdentifier()) => {
+	entity ? console.log(`Loading config from ${configDirectory} with env set to ${env}, bank set to ${bank} and entity set to ${entity}.`) : console.log(`Loading config from ${configDirectory} with env set to ${env} and bank set to ${bank}.`);
+
+	global.entity = entity;
 	const baseConfigFile = path.join(configDirectory, 'config.json');
-	const envConfigFile = env ? path.join(configDirectory, `config.${env}.json`) : null;
+	const envConfigFile = env ? entity ? path.join(configDirectory, `config.${env}.${bank}.${entity}.json`) : path.join(configDirectory, `config.${env}.${bank}.json`) : null;
 
 	return {
 		...safeLoadJson(baseConfigFile),

examples/send-c52-order-zipped.js

@@ -0,0 +1,28 @@
+#! /usr/bin/env node
+
+'use strict';
+
+const fs = require('fs');
+
+const client = require('./getClient')();
+const { Orders } = require('../index');
+
+// The bank keys must have been already saved
+client.send(Orders.C52(null, null)) // startDate 'YYYY-MM-DD', endDate 'YYYY-MM-DD'
+	.then((resp) => {
+		console.log('Response for C52 order %j', resp);
+		if (resp.technicalCode !== '000000')
+			throw new Error('Something went wrong');
+
+		// Parsing and processing the CAMT052 file should happen somewhere here, ideally after saving it to disk
+		const data = Buffer.from(resp.orderData);
+		let distPath = "CAMT052.zip"; 
+		const dstZip = fs.createWriteStream(distPath); 
+		dstZip.write(data); 
+		dstZip.end();
+	})
+
+	.catch((err) => {
+		console.error(err);
+		process.exit(1);
+	});

examples/send-c53-order-zipped.js

@@ -0,0 +1,28 @@
+#! /usr/bin/env node
+
+'use strict';
+
+const fs = require('fs');
+
+const client = require('./getClient')();
+const { Orders } = require('../index');
+
+// The bank keys must have been already saved
+client.send(Orders.C53(null, null)) // startDate 'YYYY-MM-DD', endDate 'YYYY-MM-DD'
+	.then((resp) => {
+		console.log('Response for C53 order %j', resp);
+		if (resp.technicalCode !== '000000')
+			throw new Error('Something went wrong');
+
+		// Parsing and processing the CAMT053 file should happen somewhere here, ideally after saving it to disk
+		const data = Buffer.from(resp.orderData);
+		let distPath = "CAMT053.zip"; 
+		const dstZip = fs.createWriteStream(distPath); 
+		dstZip.write(data); 
+		dstZip.end();
+	})
+
+	.catch((err) => {
+		console.error(err);
+		process.exit(1);
+	});

examples/send-g02-order-zipped.js

@@ -0,0 +1,28 @@
+#! /usr/bin/env node
+
+'use strict';
+
+const fs = require('fs');
+
+const client = require('./getClient')();
+const { Orders } = require('../index');
+
+// The bank keys must have been already saved
+client.send(Orders.G02(null, null)) // startDate 'YYYY-MM-DD', endDate 'YYYY-MM-DD'
+	.then((resp) => {
+		console.log('Response for G02 order %j', resp);
+		if (resp.technicalCode !== '000000')
+			throw new Error('Something went wrong');
+
+		// Parsing and processing the G02 Pain.002.001.06 file should happen somewhere here, ideally after saving it to disk
+		const data = Buffer.from(resp.orderData); 
+		let distPath = "G02.zip"; 
+		const dstZip = fs.createWriteStream(distPath); 
+		dstZip.write(data); 
+		dstZip.end();
+	})
+
+	.catch((err) => {
+		console.error(err);
+		process.exit(1);
+	});

examples/send-g1r-order.js

@@ -0,0 +1,20 @@
+#! /usr/bin/env node
+
+'use strict';
+
+const fs = require('fs');
+
+const client = require('./getClient')();
+const { Orders } = require('../index');
+
+// The bank keys must have been already saved
+const paymentFile = fs.readFileSync('RUB_PAYMENT.xml').toString();
+
+client.send(Orders.G1R(paymentFile))
+	.then((resp) => {
+		console.log('Response for G1R order %j', resp);
+	})
+	.catch((err) => {
+		console.error(err);
+		process.exit(1);
+	});

examples/send-g1v-order.js

@@ -0,0 +1,20 @@
+#! /usr/bin/env node
+
+'use strict';
+
+const fs = require('fs');
+
+const client = require('./getClient')();
+const { Orders } = require('../index');
+
+// The bank keys must have been already saved
+const paymentFile = fs.readFileSync('FCY_PAYMENT.xml').toString();
+
+client.send(Orders.G1V(paymentFile))
+	.then((resp) => {
+		console.log('Response for G1V order %j', resp);
+	})
+	.catch((err) => {
+		console.error(err);
+		process.exit(1);
+	});

examples/send-g52-order-zipped.js

@@ -0,0 +1,28 @@
+#! /usr/bin/env node
+
+'use strict';
+
+const fs = require('fs');
+
+const client = require('./getClient')();
+const { Orders } = require('../index');
+
+// The bank keys must have been already saved
+client.send(Orders.G52(null, null)) // startDate 'YYYY-MM-DD', endDate 'YYYY-MM-DD'
+	.then((resp) => {
+		console.log('Response for G52 order %j', resp);
+		if (resp.technicalCode !== '000000')
+			throw new Error('Something went wrong');
+
+		// Parsing and processing the CAMT052 file should happen somewhere here, ideally after saving it to disk
+		const data = Buffer.from(resp.orderData);
+		let distPath = "CAMT052-G52.zip"; 
+		const dstZip = fs.createWriteStream(distPath); 
+		dstZip.write(data); 
+		dstZip.end();
+	})
+
+	.catch((err) => {
+		console.error(err);
+		process.exit(1);
+	});

examples/send-g53-order-zipped.js

@@ -0,0 +1,28 @@
+#! /usr/bin/env node
+
+'use strict';
+
+const fs = require('fs');
+
+const client = require('./getClient')();
+const { Orders } = require('../index');
+
+// The bank keys must have been already saved
+client.send(Orders.G53(null, null)) // startDate 'YYYY-MM-DD', endDate 'YYYY-MM-DD'
+	.then((resp) => {
+		console.log('Response for G53 order %j', resp);
+		if (resp.technicalCode !== '000000')
+			throw new Error('Something went wrong');
+
+		// Parsing and processing the CAMT053 file should happen somewhere here, ideally after saving it to disk
+		const data = Buffer.from(resp.orderData);
+		let distPath = "CAMT053-G53.zip"; 
+		const dstZip = fs.createWriteStream(distPath); 
+		dstZip.write(data); 
+		dstZip.end();
+	})
+
+	.catch((err) => {
+		console.error(err);
+		process.exit(1);
+	});

lib/Client.js

@@ -46,6 +46,10 @@ const stringifyKeys = (keys) => {
  * @property {string} passphrase - passphrase for keys encryption
  * @property {KeyStorage} keyStorage - keyStorage implementation
  * @property {object} [tracesStorage] - traces (logs) storage implementation
+ * @property {string} bankName - Full name of the bank to be used in the bank INI letters.
+ * @property {string} bankShortName - Short name of the bank to be used in folders, filenames etc.
+ * @property {string} languageCode - Language code to be used in the bank INI letters ("de", "en" and "fr" are currently supported).
+ * @property {string} storageLocation - Location where to store the files that are downloaded. This can be a network share for example.
  */
 
 
@@ -62,6 +66,10 @@ module.exports = class Client {
 		passphrase,
 		keyStorage,
 		tracesStorage,
+		bankName,
+		bankShortName,
+		languageCode,
+		storageLocation,
 	}) {
 		if (!url)
 			throw new Error('EBICS URL is required');
@@ -84,6 +92,10 @@ module.exports = class Client {
 		this.keyStorage = keyStorage;
 		this.keyEncryptor = defaultKeyEncryptor({ passphrase });
 		this.tracesStorage = tracesStorage || null;
+		this.bankName = bankName || 'Dummy Bank Full Name';
+		this.bankShortName = bankShortName || 'BANKSHORTCODE';
+		this.languageCode = languageCode || 'en';
+		this.storageLocation = storageLocation || null;
 	}
 
 	async send(order) {

lib/crypto/Crypto.js

@@ -67,12 +67,15 @@ module.exports = class Crypto {
 	}
 
 	static sign(key, msg, salt = crypto.randomBytes(32)) {
-		// console.log(key.d());
 		const base = new BigNumber(emsaPSS(msg, salt));
 		const power = new BigNumber(key.d());
 		const mod = new BigNumber(key.n());
+		const buffer = modPow(base, power, mod).toBEBuffer();
 
-		return (modPow(base, power, mod)).toBEBuffer().toString('base64');
+		if (buffer.byteLength === 257 && buffer[0] === 0x00)
+			return buffer.slice(1).toString('base64');
+
+		return buffer.toString('base64');
 	}
 
 	static pad(d) {

lib/predefinedOrders/G02.js

@@ -0,0 +1,13 @@
+'use strict';
+
+const utils = require('../utils');
+
+module.exports = (start = null, end = null) => ({
+	version: 'h004',
+	orderDetails: {
+		OrderType: 'G02',
+		OrderAttribute: 'DZHNN',
+		StandardOrderParams: utils.dateRange(start, end),
+	},
+	operation: 'download',
+});

lib/predefinedOrders/G1R.js

@@ -0,0 +1,8 @@
+'use strict';
+
+module.exports = document => ({
+	version: 'h004',
+	orderDetails: { OrderType: 'G1R', OrderAttribute: 'DZHNN', StandardOrderParams: {} },
+	operation: 'upload',
+	document,
+});

lib/predefinedOrders/G1V.js

@@ -0,0 +1,8 @@
+'use strict';
+
+module.exports = document => ({
+	version: 'h004',
+	orderDetails: { OrderType: 'G1V', OrderAttribute: 'DZHNN', StandardOrderParams: {} },
+	operation: 'upload',
+	document,
+});

lib/predefinedOrders/G52.js

@@ -0,0 +1,13 @@
+'use strict';
+
+const utils = require('../utils');
+
+module.exports = (start = null, end = null) => ({
+	version: 'h004',
+	orderDetails: {
+		OrderType: 'G52',
+		OrderAttribute: 'DZHNN',
+		StandardOrderParams: utils.dateRange(start, end),
+	},
+	operation: 'download',
+});

lib/predefinedOrders/G53.js

@@ -0,0 +1,13 @@
+'use strict';
+
+const utils = require('../utils');
+
+module.exports = (start = null, end = null) => ({
+	version: 'h004',
+	orderDetails: {
+		OrderType: 'G53',
+		OrderAttribute: 'DZHNN',
+		StandardOrderParams: utils.dateRange(start, end),
+	},
+	operation: 'download',
+});

lib/predefinedOrders/index.js

@@ -14,6 +14,8 @@ const CCS = require('./CCS');
 const XE3 = require('./XE3');
 const XCT = require('./XCT');
 const XG1 = require('./XG1');
+const G1V = require('./G1V');
+const G1R = require('./G1R');
 
 const STA = require('./STA');
 const VMK = require('./VMK');
@@ -27,6 +29,9 @@ const Z53 = require('./Z53');
 const DKI = require('./DKI');
 const C52 = require('./C52');
 const C53 = require('./C53');
+const G52 = require('./G52');
+const G53 = require('./G53');
+const G02 = require('./G02');
 
 module.exports = {
 	INI,
@@ -44,6 +49,8 @@ module.exports = {
 	XE3,
 	XCT,
 	XG1,
+	G1V,
+	G1R,
 
 	STA,
 	VMK,
@@ -56,4 +63,7 @@ module.exports = {
 	DKI,
 	C52,
 	C53,
+	G52,
+	G53,
+	G02,
 };

package-lock.json

@@ -1,6 +1,6 @@
 {
 	"name": "ebics-client",
-	"version": "0.1.6",
+	"version": "0.1.7",
 	"lockfileVersion": 1,
 	"requires": true,
 	"dependencies": {
@@ -13,59 +13,70 @@
 				"@babel/highlight": "^7.0.0"
 			}
 		},
+		"@babel/compat-data": {
+			"version": "7.13.12",
+			"resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.13.12.tgz",
+			"integrity": "sha512-3eJJ841uKxeV8dcN/2yGEUy+RfgQspPEgQat85umsE1rotuquQ2AbIub4S6j7c50a2d+4myc+zSlnXeIHrOnhQ==",
+			"dev": true
+		},
 		"@babel/core": {
-			"version": "7.9.6",
-			"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.6.tgz",
-			"integrity": "sha512-nD3deLvbsApbHAHttzIssYqgb883yU/d9roe4RZymBCDaZryMJDbptVpEpeQuRh4BJ+SYI8le9YGxKvFEvl1Wg==",
+			"version": "7.13.14",
+			"resolved": "https://registry.npmjs.org/@babel/core/-/core-7.13.14.tgz",
+			"integrity": "sha512-wZso/vyF4ki0l0znlgM4inxbdrUvCb+cVz8grxDq+6C9k6qbqoIJteQOKicaKjCipU3ISV+XedCqpL2RJJVehA==",
 			"dev": true,
 			"requires": {
-				"@babel/code-frame": "^7.8.3",
-				"@babel/generator": "^7.9.6",
-				"@babel/helper-module-transforms": "^7.9.0",
-				"@babel/helpers": "^7.9.6",
-				"@babel/parser": "^7.9.6",
-				"@babel/template": "^7.8.6",
-				"@babel/traverse": "^7.9.6",
-				"@babel/types": "^7.9.6",
+				"@babel/code-frame": "^7.12.13",
+				"@babel/generator": "^7.13.9",
+				"@babel/helper-compilation-targets": "^7.13.13",
+				"@babel/helper-module-transforms": "^7.13.14",
+				"@babel/helpers": "^7.13.10",
+				"@babel/parser": "^7.13.13",
+				"@babel/template": "^7.12.13",
+				"@babel/traverse": "^7.13.13",
+				"@babel/types": "^7.13.14",
 				"convert-source-map": "^1.7.0",
 				"debug": "^4.1.0",
-				"gensync": "^1.0.0-beta.1",
+				"gensync": "^1.0.0-beta.2",
 				"json5": "^2.1.2",
-				"lodash": "^4.17.13",
-				"resolve": "^1.3.2",
-				"semver": "^5.4.1",
+				"semver": "^6.3.0",
 				"source-map": "^0.5.0"
 			},
 			"dependencies": {
 				"@babel/code-frame": {
-					"version": "7.8.3",
-					"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz",
-					"integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==",
+					"version": "7.12.13",
+					"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
+					"integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
 					"dev": true,
 					"requires": {
-						"@babel/highlight": "^7.8.3"
+						"@babel/highlight": "^7.12.13"
 					}
 				},
 				"@babel/highlight": {
-					"version": "7.9.0",
-					"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz",
-					"integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==",
+					"version": "7.13.10",
+					"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.10.tgz",
+					"integrity": "sha512-5aPpe5XQPzflQrFwL1/QoeHkP2MsA4JCntcXHRhEsdsfPVkvPi2w7Qix4iV7t5S/oC9OodGrggd8aco1g3SZFg==",
 					"dev": true,
 					"requires": {
-						"@babel/helper-validator-identifier": "^7.9.0",
+						"@babel/helper-validator-identifier": "^7.12.11",
 						"chalk": "^2.0.0",
 						"js-tokens": "^4.0.0"
 					}
 				},
 				"debug": {
-					"version": "4.1.1",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"version": "4.3.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+					"integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
 					"dev": true,
 					"requires": {
-						"ms": "^2.1.1"
+						"ms": "2.1.2"
 					}
 				},
+				"semver": {
+					"version": "6.3.0",
+					"resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz",
+					"integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==",
+					"dev": true
+				},
 				"source-map": {
 					"version": "0.5.7",
 					"resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
@@ -75,14 +86,13 @@
 			}
 		},
 		"@babel/generator": {
-			"version": "7.9.6",
-			"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.6.tgz",
-			"integrity": "sha512-+htwWKJbH2bL72HRluF8zumBxzuX0ZZUFl3JLNyoUjM/Ho8wnVpPXM6aUz8cfKDqQ/h7zHqKt4xzJteUosckqQ==",
+			"version": "7.13.9",
+			"resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.13.9.tgz",
+			"integrity": "sha512-mHOOmY0Axl/JCTkxTU6Lf5sWOg/v8nUa+Xkt4zMTftX0wqmb6Sh7J8gvcehBw7q0AhrhAR+FDacKjCZ2X8K+Sw==",
 			"dev": true,
 			"requires": {
-				"@babel/types": "^7.9.6",
+				"@babel/types": "^7.13.0",
 				"jsesc": "^2.5.1",
-				"lodash": "^4.17.13",
 				"source-map": "^0.5.0"
 			},
 			"dependencies": {
@@ -94,114 +104,140 @@
 				}
 			}
 		},
-		"@babel/helper-function-name": {
-			"version": "7.9.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.9.5.tgz",
-			"integrity": "sha512-JVcQZeXM59Cd1qanDUxv9fgJpt3NeKUaqBqUEvfmQ+BCOKq2xUgaWZW2hr0dkbyJgezYuplEoh5knmrnS68efw==",
+		"@babel/helper-compilation-targets": {
+			"version": "7.13.13",
+			"resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.13.tgz",
+			"integrity": "sha512-q1kcdHNZehBwD9jYPh3WyXcsFERi39X4I59I3NadciWtNDyZ6x+GboOxncFK0kXlKIv6BJm5acncehXWUjWQMQ==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-get-function-arity": "^7.8.3",
-				"@babel/template": "^7.8.3",
-				"@babel/types": "^7.9.5"
+				"@babel/compat-data": "^7.13.12",
+				"@babel/helper-validator-option": "^7.12.17",
+				"browserslist": "^4.14.5",
+				"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
+				}
+			}
+		},
+		"@babel/helper-function-name": {
+			"version": "7.12.13",
+			"resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz",
+			"integrity": "sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==",
+			"dev": true,
+			"requires": {
+				"@babel/helper-get-function-arity": "^7.12.13",
+				"@babel/template": "^7.12.13",
+				"@babel/types": "^7.12.13"
 			}
 		},
 		"@babel/helper-get-function-arity": {
-			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz",
-			"integrity": "sha512-FVDR+Gd9iLjUMY1fzE2SR0IuaJToR4RkCDARVfsBBPSP53GEqSFjD8gNyxg246VUyc/ALRxFaAK8rVG7UT7xRA==",
+			"version": "7.12.13",
+			"resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz",
+			"integrity": "sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==",
 			"dev": true,
 			"requires": {
-				"@babel/types": "^7.8.3"
+				"@babel/types": "^7.12.13"
 			}
 		},
 		"@babel/helper-member-expression-to-functions": {
-			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.8.3.tgz",
-			"integrity": "sha512-fO4Egq88utkQFjbPrSHGmGLFqmrshs11d46WI+WZDESt7Wu7wN2G2Iu+NMMZJFDOVRHAMIkB5SNh30NtwCA7RA==",
+			"version": "7.13.12",
+			"resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.12.tgz",
+			"integrity": "sha512-48ql1CLL59aKbU94Y88Xgb2VFy7a95ykGRbJJaaVv+LX5U8wFpLfiGXJJGUozsmA1oEh/o5Bp60Voq7ACyA/Sw==",
 			"dev": true,
 			"requires": {
-				"@babel/types": "^7.8.3"
+				"@babel/types": "^7.13.12"
 			}
 		},
 		"@babel/helper-module-imports": {
-			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz",
-			"integrity": "sha512-R0Bx3jippsbAEtzkpZ/6FIiuzOURPcMjHp+Z6xPe6DtApDJx+w7UYyOLanZqO8+wKR9G10s/FmHXvxaMd9s6Kg==",
+			"version": "7.13.12",
+			"resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz",
+			"integrity": "sha512-4cVvR2/1B693IuOvSI20xqqa/+bl7lqAMR59R4iu39R9aOX8/JoYY1sFaNvUMyMBGnHdwvJgUrzNLoUZxXypxA==",
 			"dev": true,
 			"requires": {
-				"@babel/types": "^7.8.3"
+				"@babel/types": "^7.13.12"
 			}
 		},
 		"@babel/helper-module-transforms": {
-			"version": "7.9.0",
-			"resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.9.0.tgz",
-			"integrity": "sha512-0FvKyu0gpPfIQ8EkxlrAydOWROdHpBmiCiRwLkUiBGhCUPRRbVD2/tm3sFr/c/GWFrQ/ffutGUAnx7V0FzT2wA==",
+			"version": "7.13.14",
+			"resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.13.14.tgz",
+			"integrity": "sha512-QuU/OJ0iAOSIatyVZmfqB0lbkVP0kDRiKj34xy+QNsnVZi/PA6BoSoreeqnxxa9EHFAIL0R9XOaAR/G9WlIy5g==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-module-imports": "^7.8.3",
-				"@babel/helper-replace-supers": "^7.8.6",
-				"@babel/helper-simple-access": "^7.8.3",
-				"@babel/helper-split-export-declaration": "^7.8.3",
-				"@babel/template": "^7.8.6",
-				"@babel/types": "^7.9.0",
-				"lodash": "^4.17.13"
+				"@babel/helper-module-imports": "^7.13.12",
+				"@babel/helper-replace-supers": "^7.13.12",
+				"@babel/helper-simple-access": "^7.13.12",
+				"@babel/helper-split-export-declaration": "^7.12.13",
+				"@babel/helper-validator-identifier": "^7.12.11",
+				"@babel/template": "^7.12.13",
+				"@babel/traverse": "^7.13.13",
+				"@babel/types": "^7.13.14"
 			}
 		},
 		"@babel/helper-optimise-call-expression": {
-			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.8.3.tgz",
-			"integrity": "sha512-Kag20n86cbO2AvHca6EJsvqAd82gc6VMGule4HwebwMlwkpXuVqrNRj6CkCV2sKxgi9MyAUnZVnZ6lJ1/vKhHQ==",
+			"version": "7.12.13",
+			"resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz",
+			"integrity": "sha512-BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA==",
 			"dev": true,
 			"requires": {
-				"@babel/types": "^7.8.3"
+				"@babel/types": "^7.12.13"
 			}
 		},
 		"@babel/helper-replace-supers": {
-			"version": "7.9.6",
-			"resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.9.6.tgz",
-			"integrity": "sha512-qX+chbxkbArLyCImk3bWV+jB5gTNU/rsze+JlcF6Nf8tVTigPJSI1o1oBow/9Resa1yehUO9lIipsmu9oG4RzA==",
+			"version": "7.13.12",
+			"resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.13.12.tgz",
+			"integrity": "sha512-Gz1eiX+4yDO8mT+heB94aLVNCL+rbuT2xy4YfyNqu8F+OI6vMvJK891qGBTqL9Uc8wxEvRW92Id6G7sDen3fFw==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-member-expression-to-functions": "^7.8.3",
-				"@babel/helper-optimise-call-expression": "^7.8.3",
-				"@babel/traverse": "^7.9.6",
-				"@babel/types": "^7.9.6"
+				"@babel/helper-member-expression-to-functions": "^7.13.12",
+				"@babel/helper-optimise-call-expression": "^7.12.13",
+				"@babel/traverse": "^7.13.0",
+				"@babel/types": "^7.13.12"
 			}
 		},
 		"@babel/helper-simple-access": {
-			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.8.3.tgz",
-			"integrity": "sha512-VNGUDjx5cCWg4vvCTR8qQ7YJYZ+HBjxOgXEl7ounz+4Sn7+LMD3CFrCTEU6/qXKbA2nKg21CwhhBzO0RpRbdCw==",
+			"version": "7.13.12",
+			"resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.13.12.tgz",
+			"integrity": "sha512-7FEjbrx5SL9cWvXioDbnlYTppcZGuCY6ow3/D5vMggb2Ywgu4dMrpTJX0JdQAIcRRUElOIxF3yEooa9gUb9ZbA==",
 			"dev": true,
 			"requires": {
-				"@babel/template": "^7.8.3",
-				"@babel/types": "^7.8.3"
+				"@babel/types": "^7.13.12"
 			}
 		},
 		"@babel/helper-split-export-declaration": {
-			"version": "7.8.3",
-			"resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz",
-			"integrity": "sha512-3x3yOeyBhW851hroze7ElzdkeRXQYQbFIb7gLK1WQYsw2GWDay5gAJNw1sWJ0VFP6z5J1whqeXH/WCdCjZv6dA==",
+			"version": "7.12.13",
+			"resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz",
+			"integrity": "sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==",
 			"dev": true,
 			"requires": {
-				"@babel/types": "^7.8.3"
+				"@babel/types": "^7.12.13"
 			}
 		},
 		"@babel/helper-validator-identifier": {
-			"version": "7.9.5",
-			"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.5.tgz",
-			"integrity": "sha512-/8arLKUFq882w4tWGj9JYzRpAlZgiWUJ+dtteNTDqrRBz9Iguck9Rn3ykuBDoUwh2TO4tSAJlrxDUOXWklJe4g==",
+			"version": "7.12.11",
+			"resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz",
+			"integrity": "sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw==",
+			"dev": true
+		},
+		"@babel/helper-validator-option": {
+			"version": "7.12.17",
+			"resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz",
+			"integrity": "sha512-TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw==",
 			"dev": true
 		},
 		"@babel/helpers": {
-			"version": "7.9.6",
-			"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.9.6.tgz",
-			"integrity": "sha512-tI4bUbldloLcHWoRUMAj4g1bF313M/o6fBKhIsb3QnGVPwRm9JsNf/gqMkQ7zjqReABiffPV6RWj7hEglID5Iw==",
+			"version": "7.13.10",
+			"resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.13.10.tgz",
+			"integrity": "sha512-4VO883+MWPDUVRF3PhiLBUFHoX/bsLTGFpFK/HqvvfBZz2D57u9XzPVNFVBTc0PW/CWR9BXTOKt8NF4DInUHcQ==",
 			"dev": true,
 			"requires": {
-				"@babel/template": "^7.8.3",
-				"@babel/traverse": "^7.9.6",
-				"@babel/types": "^7.9.6"
+				"@babel/template": "^7.12.13",
+				"@babel/traverse": "^7.13.0",
+				"@babel/types": "^7.13.0"
 			}
 		},
 		"@babel/highlight": {
@@ -216,38 +252,38 @@
 			}
 		},
 		"@babel/parser": {
-			"version": "7.9.6",
-			"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.6.tgz",
-			"integrity": "sha512-AoeIEJn8vt+d/6+PXDRPaksYhnlbMIiejioBZvvMQsOjW/JYK6k/0dKnvvP3EhK5GfMBWDPtrxRtegWdAcdq9Q==",
+			"version": "7.13.13",
+			"resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.13.13.tgz",
+			"integrity": "sha512-OhsyMrqygfk5v8HmWwOzlYjJrtLaFhF34MrfG/Z73DgYCI6ojNUTUp2TYbtnjo8PegeJp12eamsNettCQjKjVw==",
 			"dev": true
 		},
 		"@babel/template": {
-			"version": "7.8.6",
-			"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.8.6.tgz",
-			"integrity": "sha512-zbMsPMy/v0PWFZEhQJ66bqjhH+z0JgMoBWuikXybgG3Gkd/3t5oQ1Rw2WQhnSrsOmsKXnZOx15tkC4qON/+JPg==",
+			"version": "7.12.13",
+			"resolved": "https://registry.npmjs.org/@babel/template/-/template-7.12.13.tgz",
+			"integrity": "sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==",
 			"dev": true,
 			"requires": {
-				"@babel/code-frame": "^7.8.3",
-				"@babel/parser": "^7.8.6",
-				"@babel/types": "^7.8.6"
+				"@babel/code-frame": "^7.12.13",
+				"@babel/parser": "^7.12.13",
+				"@babel/types": "^7.12.13"
 			},
 			"dependencies": {
 				"@babel/code-frame": {
-					"version": "7.8.3",
-					"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz",
-					"integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==",
+					"version": "7.12.13",
+					"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
+					"integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
 					"dev": true,
 					"requires": {
-						"@babel/highlight": "^7.8.3"
+						"@babel/highlight": "^7.12.13"
 					}
 				},
 				"@babel/highlight": {
-					"version": "7.9.0",
-					"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz",
-					"integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==",
+					"version": "7.13.10",
+					"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.10.tgz",
+					"integrity": "sha512-5aPpe5XQPzflQrFwL1/QoeHkP2MsA4JCntcXHRhEsdsfPVkvPi2w7Qix4iV7t5S/oC9OodGrggd8aco1g3SZFg==",
 					"dev": true,
 					"requires": {
-						"@babel/helper-validator-identifier": "^7.9.0",
+						"@babel/helper-validator-identifier": "^7.12.11",
 						"chalk": "^2.0.0",
 						"js-tokens": "^4.0.0"
 					}
@@ -255,72 +291,72 @@
 			}
 		},
 		"@babel/traverse": {
-			"version": "7.9.6",
-			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.6.tgz",
-			"integrity": "sha512-b3rAHSjbxy6VEAvlxM8OV/0X4XrG72zoxme6q1MOoe2vd0bEc+TwayhuC1+Dfgqh1QEG+pj7atQqvUprHIccsg==",
+			"version": "7.13.13",
+			"resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.13.13.tgz",
+			"integrity": "sha512-CblEcwmXKR6eP43oQGG++0QMTtCjAsa3frUuzHoiIJWpaIIi8dwMyEFUJoXRLxagGqCK+jALRwIO+o3R9p/uUg==",
 			"dev": true,
 			"requires": {
-				"@babel/code-frame": "^7.8.3",
-				"@babel/generator": "^7.9.6",
-				"@babel/helper-function-name": "^7.9.5",
-				"@babel/helper-split-export-declaration": "^7.8.3",
-				"@babel/parser": "^7.9.6",
-				"@babel/types": "^7.9.6",
+				"@babel/code-frame": "^7.12.13",
+				"@babel/generator": "^7.13.9",
+				"@babel/helper-function-name": "^7.12.13",
+				"@babel/helper-split-export-declaration": "^7.12.13",
+				"@babel/parser": "^7.13.13",
+				"@babel/types": "^7.13.13",
 				"debug": "^4.1.0",
-				"globals": "^11.1.0",
-				"lodash": "^4.17.13"
+				"globals": "^11.1.0"
 			},
 			"dependencies": {
 				"@babel/code-frame": {
-					"version": "7.8.3",
-					"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.8.3.tgz",
-					"integrity": "sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g==",
+					"version": "7.12.13",
+					"resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.12.13.tgz",
+					"integrity": "sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==",
 					"dev": true,
 					"requires": {
-						"@babel/highlight": "^7.8.3"
+						"@babel/highlight": "^7.12.13"
 					}
 				},
 				"@babel/highlight": {
-					"version": "7.9.0",
-					"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz",
-					"integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==",
+					"version": "7.13.10",
+					"resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.13.10.tgz",
+					"integrity": "sha512-5aPpe5XQPzflQrFwL1/QoeHkP2MsA4JCntcXHRhEsdsfPVkvPi2w7Qix4iV7t5S/oC9OodGrggd8aco1g3SZFg==",
 					"dev": true,
 					"requires": {
-						"@babel/helper-validator-identifier": "^7.9.0",
+						"@babel/helper-validator-identifier": "^7.12.11",
 						"chalk": "^2.0.0",
 						"js-tokens": "^4.0.0"
 					}
 				},
 				"debug": {
-					"version": "4.1.1",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"version": "4.3.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+					"integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
 					"dev": true,
 					"requires": {
-						"ms": "^2.1.1"
+						"ms": "2.1.2"
 					}
 				}
 			}
 		},
 		"@babel/types": {
-			"version": "7.9.6",
-			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.6.tgz",
-			"integrity": "sha512-qxXzvBO//jO9ZnoasKF1uJzHd2+M6Q2ZPIVfnFps8JJvXy0ZBbwbNOmE6SGIY5XOY6d1Bo5lb9d9RJ8nv3WSeA==",
+			"version": "7.13.14",
+			"resolved": "https://registry.npmjs.org/@babel/types/-/types-7.13.14.tgz",
+			"integrity": "sha512-A2aa3QTkWoyqsZZFl56MLUsfmh7O0gN41IPvXAE/++8ojpbz12SszD7JEGYVdn4f9Kt4amIei07swF1h4AqmmQ==",
 			"dev": true,
 			"requires": {
-				"@babel/helper-validator-identifier": "^7.9.5",
-				"lodash": "^4.17.13",
+				"@babel/helper-validator-identifier": "^7.12.11",
+				"lodash": "^4.17.19",
 				"to-fast-properties": "^2.0.0"
 			}
 		},
 		"@istanbuljs/load-nyc-config": {
-			"version": "1.0.0",
-			"resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.0.0.tgz",
-			"integrity": "sha512-ZR0rq/f/E4f4XcgnDvtMWXCUJpi8eO0rssVhmztsZqLIEFA9UUP9zmpE0VxlM+kv/E1ul2I876Fwil2ayptDVg==",
+			"version": "1.1.0",
+			"resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
+			"integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==",
 			"dev": true,
 			"requires": {
 				"camelcase": "^5.3.1",
 				"find-up": "^4.1.0",
+				"get-package-type": "^0.1.0",
 				"js-yaml": "^3.13.1",
 				"resolve-from": "^5.0.0"
 			},
@@ -383,15 +419,9 @@
 			}
 		},
 		"@istanbuljs/schema": {
-			"version": "0.1.2",
-			"resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.2.tgz",
-			"integrity": "sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==",
-			"dev": true
-		},
-		"@types/color-name": {
-			"version": "1.1.1",
-			"resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
-			"integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==",
+			"version": "0.1.3",
+			"resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz",
+			"integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==",
 			"dev": true
 		},
 		"abbrev": {
@@ -413,9 +443,9 @@
 			"dev": true
 		},
 		"aggregate-error": {
-			"version": "3.0.1",
-			"resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.0.1.tgz",
-			"integrity": "sha512-quoaXsZ9/BLNae5yiNoUz+Nhkwz83GhWwtYFglcjEQB2NDHCIpApbqXxIFnm4Pq/Nvhrsq5sYJFyohrrxnTGAA==",
+			"version": "3.1.0",
+			"resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz",
+			"integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==",
 			"dev": true,
 			"requires": {
 				"clean-stack": "^2.0.0",
@@ -644,6 +674,19 @@
 			"integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==",
 			"dev": true
 		},
+		"browserslist": {
+			"version": "4.16.3",
+			"resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.16.3.tgz",
+			"integrity": "sha512-vIyhWmIkULaq04Gt93txdh+j02yX/JzlyhLYbV3YQCn/zvES3JnY7TifHHvvr1w5hTDluNKMkV05cs4vy8Q7sw==",
+			"dev": true,
+			"requires": {
+				"caniuse-lite": "^1.0.30001181",
+				"colorette": "^1.2.1",
+				"electron-to-chromium": "^1.3.649",
+				"escalade": "^3.1.1",
+				"node-releases": "^1.1.70"
+			}
+		},
 		"caching-transform": {
 			"version": "4.0.0",
 			"resolved": "https://registry.npmjs.org/caching-transform/-/caching-transform-4.0.0.tgz",
@@ -668,22 +711,28 @@
 			"integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==",
 			"dev": true
 		},
+		"caniuse-lite": {
+			"version": "1.0.30001204",
+			"resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001204.tgz",
+			"integrity": "sha512-JUdjWpcxfJ9IPamy2f5JaRDCaqJOxDzOSKtbdx4rH9VivMd1vIzoPumsJa9LoMIi4Fx2BV2KZOxWhNkBjaYivQ==",
+			"dev": true
+		},
 		"caseless": {
 			"version": "0.12.0",
 			"resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz",
 			"integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw="
 		},
 		"chai": {
-			"version": "4.2.0",
-			"resolved": "https://registry.npmjs.org/chai/-/chai-4.2.0.tgz",
-			"integrity": "sha512-XQU3bhBukrOsQCuwZndwGcCVQHyZi53fQ6Ys1Fym7E4olpIqqZZhhoFJoaKVvV17lWQoXYwgWN2nF5crA8J2jw==",
+			"version": "4.3.4",
+			"resolved": "https://registry.npmjs.org/chai/-/chai-4.3.4.tgz",
+			"integrity": "sha512-yS5H68VYOCtN1cjfwumDSuzn/9c+yza4f3reKXlE5rUg7SFcCEy90gJvydNgOYtblyf4Zi6jIWRnXOgErta0KA==",
 			"dev": true,
 			"requires": {
 				"assertion-error": "^1.1.0",
 				"check-error": "^1.0.2",
 				"deep-eql": "^3.0.1",
 				"get-func-name": "^2.0.0",
-				"pathval": "^1.1.0",
+				"pathval": "^1.1.1",
 				"type-detect": "^4.0.5"
 			}
 		},
@@ -833,6 +882,12 @@
 			"integrity": "sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=",
 			"dev": true
 		},
+		"colorette": {
+			"version": "1.2.2",
+			"resolved": "https://registry.npmjs.org/colorette/-/colorette-1.2.2.tgz",
+			"integrity": "sha512-MKGMzyfeuutC/ZJ1cba9NqcNpfeqMUcYmyF1ZFY6/Cn7CNSAKx6a+s48sqLqyAiZuaP2TcqMhoo+dlwFnVxT9w==",
+			"dev": true
+		},
 		"combined-stream": {
 			"version": "1.0.8",
 			"resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
@@ -841,12 +896,6 @@
 				"delayed-stream": "~1.0.0"
 			}
 		},
-		"commander": {
-			"version": "2.20.3",
-			"resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz",
-			"integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==",
-			"optional": true
-		},
 		"commondir": {
 			"version": "1.0.1",
 			"resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
@@ -1050,6 +1099,12 @@
 				"safer-buffer": "^2.1.0"
 			}
 		},
+		"electron-to-chromium": {
+			"version": "1.3.702",
+			"resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.702.tgz",
+			"integrity": "sha512-qJVUKFWQnF6wP7MmTngDkmm8/KPzaiTXNFOAg5j7DSa6J7kPou7mTBqC8jpUOxauQWwHR3pn4dMRdV8IE1xdtA==",
+			"dev": true
+		},
 		"emoji-regex": {
 			"version": "7.0.3",
 			"resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-7.0.3.tgz",
@@ -1100,6 +1155,12 @@
 			"integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==",
 			"dev": true
 		},
+		"escalade": {
+			"version": "3.1.1",
+			"resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.1.tgz",
+			"integrity": "sha512-k0er2gUkLf8O0zKJiAhmkTnJlTvINGv7ygDNPbeIsX/TJjGJZHuh9B2UxbsaEkmlEo9MfhrSzmhIlhRlI2GXnw==",
+			"dev": true
+		},
 		"escape-string-regexp": {
 			"version": "1.0.5",
 			"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
@@ -1628,9 +1689,9 @@
 			},
 			"dependencies": {
 				"cross-spawn": {
-					"version": "7.0.2",
-					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.2.tgz",
-					"integrity": "sha512-PD6G8QG3S4FK/XCGFbEQrDqO2AnMMsy0meR7lerlIOHAAbkuavGU/pOqprrlvfTNjvowivTeBsjebAL0NSoMxw==",
+					"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",
@@ -1686,9 +1747,9 @@
 			}
 		},
 		"fromentries": {
-			"version": "1.2.0",
-			"resolved": "https://registry.npmjs.org/fromentries/-/fromentries-1.2.0.tgz",
-			"integrity": "sha512-33X7H/wdfO99GdRLLgkjUrD4geAFdq/Uv0kl3HD4da6HDixd2GUg8Mw7dahLCV9r/EARkmtYBB6Tch4EEokFTQ==",
+			"version": "1.3.2",
+			"resolved": "https://registry.npmjs.org/fromentries/-/fromentries-1.3.2.tgz",
+			"integrity": "sha512-cHEpEQHUg0f8XdtZCc2ZAhrHzKzT0MrFUTcvx+hfxYu7rGMDc5SKoXFh+n4YigxsHXRzc6OrCshdR1bWH6HHyg==",
 			"dev": true
 		},
 		"fs-minipass": {
@@ -1764,9 +1825,9 @@
 			}
 		},
 		"gensync": {
-			"version": "1.0.0-beta.1",
-			"resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz",
-			"integrity": "sha512-r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg==",
+			"version": "1.0.0-beta.2",
+			"resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+			"integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
 			"dev": true
 		},
 		"get-caller-file": {
@@ -1781,6 +1842,12 @@
 			"integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=",
 			"dev": true
 		},
+		"get-package-type": {
+			"version": "0.1.0",
+			"resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
+			"integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
+			"dev": true
+		},
 		"getpass": {
 			"version": "0.1.7",
 			"resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz",
@@ -1831,22 +1898,15 @@
 			"dev": true
 		},
 		"handlebars": {
-			"version": "4.7.6",
-			"resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.6.tgz",
-			"integrity": "sha512-1f2BACcBfiwAfStCKZNrUCgqNZkGsAT7UM3kkYtXuLo0KnaVfjKOyf7PRzB6++aK9STyT1Pd2ZCPe3EGOXleXA==",
+			"version": "4.7.7",
+			"resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.7.tgz",
+			"integrity": "sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==",
 			"requires": {
 				"minimist": "^1.2.5",
 				"neo-async": "^2.6.0",
 				"source-map": "^0.6.1",
 				"uglify-js": "^3.1.4",
 				"wordwrap": "^1.0.0"
-			},
-			"dependencies": {
-				"minimist": {
-					"version": "1.2.5",
-					"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-					"integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
-				}
 			}
 		},
 		"har-schema": {
@@ -1891,9 +1951,9 @@
 			"dev": true
 		},
 		"hasha": {
-			"version": "5.2.0",
-			"resolved": "https://registry.npmjs.org/hasha/-/hasha-5.2.0.tgz",
-			"integrity": "sha512-2W+jKdQbAdSIrggA8Q35Br8qKadTrqCTC8+XZvBWepKDK6m9XkX6Iz1a2yh2KP01kzAR/dpuMeUnocoLYDcskw==",
+			"version": "5.2.2",
+			"resolved": "https://registry.npmjs.org/hasha/-/hasha-5.2.2.tgz",
+			"integrity": "sha512-Hrp5vIK/xr5SkeN2onO32H0MgNZ0f17HRNH39WfL0SYUNOTZ5Lz1TJ8Pajo/87dYGEFlLMm7mIc/k/s6Bvz9HQ==",
 			"dev": true,
 			"requires": {
 				"is-stream": "^2.0.0",
@@ -2210,15 +2270,12 @@
 			}
 		},
 		"istanbul-lib-instrument": {
-			"version": "4.0.1",
-			"resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.1.tgz",
-			"integrity": "sha512-imIchxnodll7pvQBYOqUu88EufLCU56LMeFPZZM/fJZ1irYcYdqroaV+ACK1Ila8ls09iEYArp+nqyC6lW1Vfg==",
+			"version": "4.0.3",
+			"resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz",
+			"integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==",
 			"dev": true,
 			"requires": {
 				"@babel/core": "^7.7.5",
-				"@babel/parser": "^7.7.5",
-				"@babel/template": "^7.7.4",
-				"@babel/traverse": "^7.7.4",
 				"@istanbuljs/schema": "^0.1.2",
 				"istanbul-lib-coverage": "^3.0.0",
 				"semver": "^6.3.0"
@@ -2248,9 +2305,9 @@
 			},
 			"dependencies": {
 				"cross-spawn": {
-					"version": "7.0.2",
-					"resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.2.tgz",
-					"integrity": "sha512-PD6G8QG3S4FK/XCGFbEQrDqO2AnMMsy0meR7lerlIOHAAbkuavGU/pOqprrlvfTNjvowivTeBsjebAL0NSoMxw==",
+					"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",
@@ -2323,9 +2380,9 @@
 					"dev": true
 				},
 				"supports-color": {
-					"version": "7.1.0",
-					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
-					"integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+					"version": "7.2.0",
+					"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
+					"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
 					"dev": true,
 					"requires": {
 						"has-flag": "^4.0.0"
@@ -2345,12 +2402,12 @@
 			},
 			"dependencies": {
 				"debug": {
-					"version": "4.1.1",
-					"resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
-					"integrity": "sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw==",
+					"version": "4.3.1",
+					"resolved": "https://registry.npmjs.org/debug/-/debug-4.3.1.tgz",
+					"integrity": "sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ==",
 					"dev": true,
 					"requires": {
-						"ms": "^2.1.1"
+						"ms": "2.1.2"
 					}
 				}
 			}
@@ -2422,20 +2479,12 @@
 			"integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus="
 		},
 		"json5": {
-			"version": "2.1.3",
-			"resolved": "https://registry.npmjs.org/json5/-/json5-2.1.3.tgz",
-			"integrity": "sha512-KXPvOm8K9IJKFM0bmdn8QXh7udDh1g/giieX0NLCaMnb4hEiVFqnop2ImTXCc5e0/oHz3LTqmHGtExn5hfMkOA==",
+			"version": "2.2.0",
+			"resolved": "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz",
+			"integrity": "sha512-f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA==",
 			"dev": true,
 			"requires": {
 				"minimist": "^1.2.5"
-			},
-			"dependencies": {
-				"minimist": {
-					"version": "1.2.5",
-					"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-					"integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
-					"dev": true
-				}
 			}
 		},
 		"jsprim": {
@@ -2567,8 +2616,7 @@
 		"minimist": {
 			"version": "1.2.5",
 			"resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
-			"integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
-			"dev": true
+			"integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="
 		},
 		"minipass": {
 			"version": "2.9.0",
@@ -2746,9 +2794,9 @@
 			}
 		},
 		"neo-async": {
-			"version": "2.6.1",
-			"resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.1.tgz",
-			"integrity": "sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw=="
+			"version": "2.6.2",
+			"resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
+			"integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="
 		},
 		"nice-try": {
 			"version": "1.0.5",
@@ -2804,6 +2852,12 @@
 				"process-on-spawn": "^1.0.0"
 			}
 		},
+		"node-releases": {
+			"version": "1.1.71",
+			"resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.71.tgz",
+			"integrity": "sha512-zR6HoT6LrLCRBwukmrVbHv0EpEQjksO6GmFcZQQuCAy139BEsoVKPYnf3jongYW83fAa1torLGYwxxky/p28sg==",
+			"dev": true
+		},
 		"nopt": {
 			"version": "4.0.1",
 			"resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz",
@@ -2867,9 +2921,9 @@
 			"dev": true
 		},
 		"nyc": {
-			"version": "15.0.1",
-			"resolved": "https://registry.npmjs.org/nyc/-/nyc-15.0.1.tgz",
-			"integrity": "sha512-n0MBXYBYRqa67IVt62qW1r/d9UH/Qtr7SF1w/nQLJ9KxvWF6b2xCHImRAixHN9tnMMYHC2P14uo6KddNGwMgGg==",
+			"version": "15.1.0",
+			"resolved": "https://registry.npmjs.org/nyc/-/nyc-15.1.0.tgz",
+			"integrity": "sha512-jMW04n9SxKdKi1ZMGhvUTHBN0EICCRkHemEoE5jm6mTYcqcdas0ATzgUgejlQUHMvpnOZqGB5Xxsv9KxJW1j8A==",
 			"dev": true,
 			"requires": {
 				"@istanbuljs/load-nyc-config": "^1.0.0",
@@ -2880,6 +2934,7 @@
 				"find-cache-dir": "^3.2.0",
 				"find-up": "^4.1.0",
 				"foreground-child": "^2.0.0",
+				"get-package-type": "^0.1.0",
 				"glob": "^7.1.6",
 				"istanbul-lib-coverage": "^3.0.0",
 				"istanbul-lib-hook": "^3.0.0",
@@ -2907,12 +2962,11 @@
 					"dev": true
 				},
 				"ansi-styles": {
-					"version": "4.2.1",
-					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
-					"integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+					"version": "4.3.0",
+					"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
+					"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
 					"dev": true,
 					"requires": {
-						"@types/color-name": "^1.1.1",
 						"color-convert": "^2.0.1"
 					}
 				},
@@ -3033,9 +3087,9 @@
 					}
 				},
 				"string-width": {
-					"version": "4.2.0",
-					"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz",
-					"integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==",
+					"version": "4.2.2",
+					"resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.2.tgz",
+					"integrity": "sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==",
 					"dev": true,
 					"requires": {
 						"emoji-regex": "^8.0.0",
@@ -3064,9 +3118,9 @@
 					}
 				},
 				"yargs": {
-					"version": "15.3.1",
-					"resolved": "https://registry.npmjs.org/yargs/-/yargs-15.3.1.tgz",
-					"integrity": "sha512-92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA==",
+					"version": "15.4.1",
+					"resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
+					"integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
 					"dev": true,
 					"requires": {
 						"cliui": "^6.0.0",
@@ -3079,7 +3133,7 @@
 						"string-width": "^4.2.0",
 						"which-module": "^2.0.0",
 						"y18n": "^4.0.0",
-						"yargs-parser": "^18.1.1"
+						"yargs-parser": "^18.1.2"
 					}
 				},
 				"yargs-parser": {
@@ -3371,9 +3425,9 @@
 			"dev": true
 		},
 		"pathval": {
-			"version": "1.1.0",
-			"resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.0.tgz",
-			"integrity": "sha1-uULm1L3mUwBe9rcTYd74cn0GReA=",
+			"version": "1.1.1",
+			"resolved": "https://registry.npmjs.org/pathval/-/pathval-1.1.1.tgz",
+			"integrity": "sha512-Dp6zGqpTdETdR63lehJYPeIOqpiNBNtc7BpWSLrOje7UaIsE5aY92r/AunQA7rsXvet3lrJ3JnZX29UPTKXyKQ==",
 			"dev": true
 		},
 		"performance-now": {
@@ -4191,13 +4245,10 @@
 			}
 		},
 		"uglify-js": {
-			"version": "3.9.2",
-			"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.9.2.tgz",
-			"integrity": "sha512-zGVwKslUAD/EeqOrD1nQaBmXIHl1Vw371we8cvS8I6mYK9rmgX5tv8AAeJdfsQ3Kk5mGax2SVV/AizxdNGhl7Q==",
-			"optional": true,
-			"requires": {
-				"commander": "~2.20.3"
-			}
+			"version": "3.13.3",
+			"resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.13.3.tgz",
+			"integrity": "sha512-otIc7O9LyxpUcQoXzj2hL4LPWKklO6LJWoJUzNa8A17Xgi4fOeDC8FBDOLHnC/Slo1CQgsZMcM6as0M76BZaig==",
+			"optional": true
 		},
 		"uri-js": {
 			"version": "4.2.2",
@@ -4214,9 +4265,9 @@
 			"dev": true
 		},
 		"uuid": {
-			"version": "8.0.0",
-			"resolved": "https://registry.npmjs.org/uuid/-/uuid-8.0.0.tgz",
-			"integrity": "sha512-jOXGuXZAWdsTH7eZLtyXMqUb9EcWMGZNbL9YcGBJl4MH4nrxHmZJhEHvyLFrkxo+28uLb/NYRcStH48fnD0Vzw=="
+			"version": "8.3.2",
+			"resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz",
+			"integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="
 		},
 		"v8-compile-cache": {
 			"version": "2.1.0",
@@ -4346,19 +4397,12 @@
 			}
 		},
 		"xml-crypto": {
-			"version": "2.0.0",
-			"resolved": "https://registry.npmjs.org/xml-crypto/-/xml-crypto-2.0.0.tgz",
-			"integrity": "sha512-/a04qr7RpONRZHOxROZ6iIHItdsQQjN3sj8lJkYDDss8tAkEaAs0VrFjb3tlhmS5snQru5lTs9/5ISSMdPDHlg==",
+			"version": "2.1.1",
+			"resolved": "https://registry.npmjs.org/xml-crypto/-/xml-crypto-2.1.1.tgz",
+			"integrity": "sha512-M+m4+HIJa83lu/CnspQjA7ap8gmanNDxxRjSisU8mPD4bqhxbo5N2bdpvG2WgVYOrPpOIOq55iY8Cz8Ai40IeQ==",
 			"requires": {
-				"xmldom": "0.1.27",
-				"xpath": "0.0.27"
-			},
-			"dependencies": {
-				"xmldom": {
-					"version": "0.1.27",
-					"resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.1.27.tgz",
-					"integrity": "sha1-1QH5ezvbQDr4757MIFcxh6rawOk="
-				}
+				"xmldom": "0.5.0",
+				"xpath": "0.0.32"
 			}
 		},
 		"xmlcreate": {
@@ -4367,19 +4411,19 @@
 			"integrity": "sha512-HgS+X6zAztGa9zIK3Y3LXuJes33Lz9x+YyTxgrkIdabu2vqcGOWwdfCpf1hWLRrd553wd4QCDf6BBO6FfdsRiQ=="
 		},
 		"xmldom": {
-			"version": "0.3.0",
-			"resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.3.0.tgz",
-			"integrity": "sha512-z9s6k3wxE+aZHgXYxSTpGDo7BYOUfJsIRyoZiX6HTjwpwfS2wpQBQKa2fD+ShLyPkqDYo5ud7KitmLZ2Cd6r0g=="
+			"version": "0.5.0",
+			"resolved": "https://registry.npmjs.org/xmldom/-/xmldom-0.5.0.tgz",
+			"integrity": "sha512-Foaj5FXVzgn7xFzsKeNIde9g6aFBxTPi37iwsno8QvApmtg7KYrr+OPyRHcJF7dud2a5nGRBXK3n0dL62Gf7PA=="
 		},
 		"xpath": {
-			"version": "0.0.27",
-			"resolved": "https://registry.npmjs.org/xpath/-/xpath-0.0.27.tgz",
-			"integrity": "sha512-fg03WRxtkCV6ohClePNAECYsmpKKTv5L8y/X3Dn1hQrec3POx2jHZ/0P2qQ6HvsrU1BmeqXcof3NGGueG6LxwQ=="
+			"version": "0.0.32",
+			"resolved": "https://registry.npmjs.org/xpath/-/xpath-0.0.32.tgz",
+			"integrity": "sha512-rxMJhSIoiO8vXcWvSifKqhvV96GjiD5wYb8/QHdoRyQvraTpp4IEv944nhGausZZ3u7dhQXteZuZbaqfpB7uYw=="
 		},
 		"y18n": {
-			"version": "4.0.0",
-			"resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.0.tgz",
-			"integrity": "sha512-r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w==",
+			"version": "4.0.1",
+			"resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.1.tgz",
+			"integrity": "sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==",
 			"dev": true
 		},
 		"yallist": {

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "ebics-client",
-	"version": "0.1.7",
+	"version": "0.2.1",
 	"description": "Node.js ISO 20022 Compliant EBICS Client",
 	"main": "index.js",
 	"files": [
@@ -51,28 +51,32 @@
 		{
 			"name": "chrwoizi",
 			"url": "https://github.com/chrwoizi"
+		},
+		{
+			"name": "Herrie",
+			"url": "https://github.com/Herrie82"
 		}
 	],
 	"license": "GPL-3.0-only",
 	"dependencies": {
-		"handlebars": "^4.7.6",
+		"handlebars": "^4.7.7",
 		"js2xmlparser": "^4.0.1",
 		"node-forge": "^0.10.0",
 		"request": "^2.88.2",
-		"uuid": "^8.0.0",
-		"xml-crypto": "^2.0.0",
-		"xmldom": "^0.3.0",
-		"xpath": "0.0.27"
+		"uuid": "^8.3.2",
+		"xml-crypto": "^2.1.1",
+		"xmldom": "^0.5.0",
+		"xpath": "0.0.32"
 	},
 	"devDependencies": {
 		"auto-changelog": "^1.16.2",
-		"chai": "^4.2.0",
+		"chai": "^4.3.4",
 		"coveralls": "^3.1.0",
 		"eslint": "^6.7.2",
 		"eslint-config-ecollect-base": "^0.1.2",
 		"eslint-plugin-import": "^2.18.2",
 		"libxmljs": "^0.19.7",
 		"mocha": "^7.1.2",
-		"nyc": "^15.0.1"
+		"nyc": "^15.1.0"
 	}
 }

templates/ini_fr.hbs

@@ -0,0 +1,164 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+
+<head>
+	<meta http-equiv="content-type" content="text/html; charset=utf-8">
+	<meta charset="UTF-8" />
+	<title>EBICS ini</title>
+</head>
+
+<body>
+	<div>
+		<h2>Lettre d'initialisation pour clés électroniques bancaires (INI)</h2>
+		<table>
+			<tr>
+				<td>Date</td>
+				<td>{{ today }}</td>
+			</tr>
+			<tr>
+				<td>Heure</td>
+				<td>{{ now }}</td>
+			</tr>
+			<tr>
+				<td>Banque</td>
+				<td>{{ bankName }}</td>
+			</tr>
+			<tr>
+				<td>ID Utilisateur</td>
+				<td>{{ userId }}</td>
+			</tr>
+			<tr>
+				<td>ID Partenaire</td>
+				<td>{{ partnerId }}</td>
+			</tr>
+		</table>
+		<p>Clé publique (Public Key) pour la signature électronique (A006)</p>
+		<p>Exposant ({{ keyExponentBits A006 }} Bit):</p>
+		<p>
+			<code>{{ keyExponent A006 }}</code>
+		</p>
+		<p>Modulo ({{ keyModulusBits A006 }} Bit):</p>
+		<p>
+			<code>{{ keyModulus A006 }}</code>
+		</p>
+		<p>Hash (SHA-256):</p>
+		<p>
+			<code>{{ sha256 A006 }}</code>
+		</p>
+		<p>Je confirme par la présente la clé publique ci-dessus pour ma signature électronique.</p>
+		<br/>
+		<br/>
+		<br/>
+		<br/>
+		<table>
+			<tr>
+				<td>_________________________</td>
+				<td>_________________________</td>
+				<td>_________________________</td>
+			</tr>
+			<tr>
+				<td>Lieu/Date</td>
+				<td>Nom/Entreprise</td>
+				<td>Signature</td>
+			</tr>
+		</table>
+	</div>
+	<div style="page-break-after:always"></div>
+	<h2>Lettre d'initialisation pour clés électroniques bancaires (HIA) - Page 1/2</h2>
+	<table>
+		<tr>
+			<td>Date</td>
+			<td>{{ today }}</td>
+		</tr>
+		<tr>
+			<td>Heure</td>
+			<td>{{ now }}</td>
+		</tr>
+		<tr>
+			<td>Banque</td>
+			<td>{{ bankName }}</td>
+		</tr>
+		<tr>
+			<td>ID Utilisateur</td>
+			<td>{{ userId }}</td>
+		</tr>
+		<tr>
+			<td>ID Partenaire</td>
+			<td>{{ partnerId }}</td>
+		</tr>
+	</table>
+	<div>
+		<p>Clé d'identification publique (X002)</p>
+		<p>Exposant ({{ keyExponentBits X002 }} Bit):</p>
+		<p>
+			<code>{{ keyExponent X002 }}</code>
+		</p>
+		<p>Modulo ({{ keyModulusBits X002 }} Bit):</p>
+		<p>
+			<code>{{ keyModulus X002 }}</code>
+		</p>
+		<p>Hash (SHA-256):</p>
+		<p>
+			<code>{{ sha256 X002 }}</code>
+		</p>
+		<p>Suite à la page 2 ...</p>
+		<div style="page-break-after:always"></div>
+		<h2>Lettre d'initialisation pour clés électroniques bancaires (HIA) - Page 2/2</h2>
+	<table>
+		<tr>
+			<td>Date</td>
+			<td>{{ today }}</td>
+		</tr>
+		<tr>
+			<td>Heure</td>
+			<td>{{ now }}</td>
+		</tr>
+		<tr>
+			<td>Banque</td>
+			<td>{{ bankName }}</td>
+		</tr>
+		<tr>
+			<td>ID Utilisateur</td>
+			<td>{{ userId }}</td>
+		</tr>
+		<tr>
+			<td>ID Partenaire</td>
+			<td>{{ partnerId }}</td>
+		</tr>
+	</table>
+	</div>
+	<div>
+		<p>Clé de chiffrement publique (E002)</p>
+		<p>Exposant ({{ keyExponentBits E002 }} Bit):</p>
+		<p>
+			<code>{{ keyExponent E002 }}</code>
+		</p>
+		<p>Modulo ({{ keyModulusBits E002 }} Bit):</p>
+		<p>
+			<code>{{ keyModulus E002 }}</code>
+		</p>
+		<p>Hash (SHA-256):</p>
+		<p>
+			<code>{{ sha256 E002 }}</code>
+		</p>
+		<p>Je confirme par la présente les clés publiques ci-dessus.</p>
+		<br/>
+		<br/>
+		<br/>
+		<br/>
+		<table>
+			<tr>
+				<td>_________________________</td>
+				<td>_________________________</td>
+				<td>_________________________</td>
+			</tr>
+			<tr>
+				<td>Lieu/Date</td>
+				<td>Nom/Entreprise</td>
+				<td>Signature</td>
+			</tr>
+		</table>
+	</div>
+</body>
+
+</html>