From bd815e96713fb17edefb09da952a74805da07d75 Mon Sep 17 00:00:00 2001 From: Paul Bienkowski Date: Tue, 17 Nov 2020 17:59:05 +0100 Subject: [PATCH 01/22] refactor: move TrackInfo and addPointsToTrack to new "logic" folder --- logic/TrackInfo.js | 11 ++++ logic/tracks.js | 117 ++++++++++++++++++++++++++++++++++++ routes/api/tracks.js | 140 +++---------------------------------------- 3 files changed, 136 insertions(+), 132 deletions(-) create mode 100644 logic/TrackInfo.js create mode 100644 logic/tracks.js diff --git a/logic/TrackInfo.js b/logic/TrackInfo.js new file mode 100644 index 0000000..91efdfb --- /dev/null +++ b/logic/TrackInfo.js @@ -0,0 +1,11 @@ + +class TrackInfo { + constructor(track,trackData) + { + this.track = track; + this.trackData = trackData; + } +} + + +module.exports = TrackInfo diff --git a/logic/tracks.js b/logic/tracks.js new file mode 100644 index 0000000..9bc9a26 --- /dev/null +++ b/logic/tracks.js @@ -0,0 +1,117 @@ +module.exports.addPointsToTrack = function addPointsToTrack(track, body) +{ + var num = 0; + var start = 0; + var end = 0; + //console.log("len"+body.length); + while (end < body.length) { + start = end; + while (body[end] != ";" && body[end] != "$" && end < body.length) { + end++; + } + if(body[end] == "$") // $ is replacing \n as newlines are not allowed in json strings + { + num=0; + } + if(end < body.length) + { + var token = body.substr(start, end - start); + end++; + if(token.length>0) + { + //console.log(token); + //console.log("num:"+num); + //console.log("end:"+end); + + if((num == 0) && (token == "Date")) + { + // we have a header line, ignore it for now, TODO parse it + if (end < body.length) { + while (body[end] != ";" && body[end] != "$" && end < body.length) { + end++; + } + start = end; + num=100; + } + } + if (num == 0) { + track.trackData.points.push({ date: "dummy", time: "", latitude: "", longitude: "", course: "", speed: "", d1: "", d2: "", flag: "", private: ""}); + track.trackData.points[track.trackData.points.length - 1].date = token; + num++; + } + else if (num == 1) { + track.trackData.points[track.trackData.points.length - 1].time = token; + num++; + } + else if (num == 2) { + var f = parseFloat(token); + if(isNaN(f)) + { + f = parseFloat(token.substring(0,10)); + } + if(isNaN(f)) + { + f=0.0; + } + track.trackData.points[track.trackData.points.length - 1].latitude = f; + num++; + } + else if (num == 3) { + var f = parseFloat(token); + if(isNaN(f)) + { + f = parseFloat(token.substring(0,10)); + } + if(isNaN(f)) + { + f=0.0; + } + track.trackData.points[track.trackData.points.length - 1].longitude = f; + num++; + } + else if (num == 4) { + var f = parseFloat(token); + if(isNaN(f)) + { + f = parseFloat(token.substring(0,10)); + } + if(isNaN(f)) + { + f=0.0; + } + track.trackData.points[track.trackData.points.length - 1].course = f; + num++; + } + else if (num == 5) { + var f = parseFloat(token); + if(isNaN(f)) + { + f = parseFloat(token.substring(0,10)); + } + if(isNaN(f)) + { + f=0.0; + } + track.trackData.points[track.trackData.points.length - 1].speed = f; + num++; + } + else if (num == 6) { + track.trackData.points[track.trackData.points.length - 1].d1 = token; + num++; + } + else if (num == 7) { + track.trackData.points[track.trackData.points.length - 1].d2 = token; + num++; + } + else if (num == 8) { + track.trackData.points[track.trackData.points.length - 1].flag = token; + num++; + } + else if (num == 9) { + track.trackData.points[track.trackData.points.length - 1].private = token; + num++; + } + } + } + } +} diff --git a/routes/api/tracks.js b/routes/api/tracks.js index 5a835e1..2ba8300 100644 --- a/routes/api/tracks.js +++ b/routes/api/tracks.js @@ -6,132 +6,8 @@ var Comment = mongoose.model('Comment'); var User = mongoose.model('User'); var auth = require('../auth'); var currentTracks = new Map(); -class trackInfo { - constructor (track,trackData) - { - this.track = track; - this.trackData = trackData; - } -} - - -function addPointsToTrack(track,body) -{ - var num = 0; - var start = 0; - var end = 0; - //console.log("len"+body.length); - while (end < body.length) { - start = end; - while (body[end] != ";" && body[end] != "$" && end < body.length) { - end++; - } - if(body[end] == "$") // $ is replacing \n as newlines are not allowed in json strings - { - num=0; - } - if(end < body.length) - { - var token = body.substr(start, end - start); - end++; - if(token.length>0) - { - //console.log(token); - //console.log("num:"+num); - //console.log("end:"+end); - - if((num == 0) && (token == "Date")) - { - // we have a header line, ignore it for now, TODO parse it - if (end < body.length) { - while (body[end] != ";" && body[end] != "$" && end < body.length) { - end++; - } - start = end; - num=100; - } - } - if (num == 0) { - track.trackData.points.push({ date: "dummy", time: "", latitude: "", longitude: "", course: "", speed: "", d1: "", d2: "", flag: "", private: ""}); - track.trackData.points[track.trackData.points.length - 1].date = token; - num++; - } - else if (num == 1) { - track.trackData.points[track.trackData.points.length - 1].time = token; - num++; - } - else if (num == 2) { - var f = parseFloat(token); - if(isNaN(f)) - { - f = parseFloat(token.substring(0,10)); - } - if(isNaN(f)) - { - f=0.0; - } - track.trackData.points[track.trackData.points.length - 1].latitude = f; - num++; - } - else if (num == 3) { - var f = parseFloat(token); - if(isNaN(f)) - { - f = parseFloat(token.substring(0,10)); - } - if(isNaN(f)) - { - f=0.0; - } - track.trackData.points[track.trackData.points.length - 1].longitude = f; - num++; - } - else if (num == 4) { - var f = parseFloat(token); - if(isNaN(f)) - { - f = parseFloat(token.substring(0,10)); - } - if(isNaN(f)) - { - f=0.0; - } - track.trackData.points[track.trackData.points.length - 1].course = f; - num++; - } - else if (num == 5) { - var f = parseFloat(token); - if(isNaN(f)) - { - f = parseFloat(token.substring(0,10)); - } - if(isNaN(f)) - { - f=0.0; - } - track.trackData.points[track.trackData.points.length - 1].speed = f; - num++; - } - else if (num == 6) { - track.trackData.points[track.trackData.points.length - 1].d1 = token; - num++; - } - else if (num == 7) { - track.trackData.points[track.trackData.points.length - 1].d2 = token; - num++; - } - else if (num == 8) { - track.trackData.points[track.trackData.points.length - 1].flag = token; - num++; - } - else if (num == 9) { - track.trackData.points[track.trackData.points.length - 1].private = token; - num++; - } - } - } - } -} +var TrackInfo = require('../../logic/TrackInfo'); +var {addPointsToTrack} = require('../../logic/tracks'); // Preload track objects on routes with ':track' router.param('track', function(req, res, next, slug) { @@ -291,7 +167,7 @@ router.post('/', auth.required, function(req, res, next) { var track = new Track(req.body.track); var trackData = new TrackData(); track.trackData = trackData._id; - + track.author = user; track.visible = track.author.areTracksVisibleForAll; trackData.save(function (err){ @@ -318,7 +194,7 @@ router.post('/add', auth.optional, function(req, res, next) { var ti = null; if (currentTracks.has(req.body.id)) ti = currentTracks.get(req.body.id); - + //console.log("TI" + ti); //console.log("TILen" + ti.trackData.points.length); //console.log("TITrack" + ti.track); @@ -345,12 +221,12 @@ router.post('/begin', auth.optional, function (req, res, next) { if(currentTracks.has(req.body.id)) currentTracks.delete(req.body.id); // delete old parts if there are leftovers - var ti = new trackInfo(new Track(req.body.track),new TrackData()); - ti.track.trackData = ti.trackData._id; + var ti = new TrackInfo(new Track(req.body.track),new TrackData()); + ti.track.trackData = ti.trackData._id; currentTracks.set(req.body.id, ti); //console.log("addToTrack"+req.body); - + addPointsToTrack(ti, ti.track.body); //console.log("TLen" + ti.track); @@ -381,7 +257,7 @@ router.post('/end', auth.optional, function (req, res, next) { } else { - var ti = new trackInfo(new Track(req.body.track),new TrackData()); + var ti = new TrackInfo(new Track(req.body.track),new TrackData()); ti.track.trackData = ti.trackData._id; addPointsToTrack(ti, ti.track.body); } From b95d3dad3a07290d5fabe9d063aa4a213c6a3716 Mon Sep 17 00:00:00 2001 From: Paul Bienkowski Date: Tue, 17 Nov 2020 18:01:29 +0100 Subject: [PATCH 02/22] chore: add testing framework (jest) and start writing test for tracks logic --- logic/tracks.test.js | 8 + package-lock.json | 4583 +++++++++++++++++++++++++++++++++++++++++- package.json | 7 +- 3 files changed, 4542 insertions(+), 56 deletions(-) create mode 100644 logic/tracks.test.js diff --git a/logic/tracks.test.js b/logic/tracks.test.js new file mode 100644 index 0000000..e438bcf --- /dev/null +++ b/logic/tracks.test.js @@ -0,0 +1,8 @@ +var {addPointsToTrack} = require('./tracks') + +describe('addPointsToTrack', () => { + it('is a function', () => { + expect(typeof addPointsToTrack).toBe('function') + }) +}) + diff --git a/package-lock.json b/package-lock.json index 1067256..803c64a 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4,6 +4,355 @@ "lockfileVersion": 1, "requires": true, "dependencies": { + "@babel/code-frame": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz", + "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==", + "requires": { + "@babel/highlight": "^7.10.4" + } + }, + "@babel/core": { + "version": "7.12.3", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.12.3.tgz", + "integrity": "sha512-0qXcZYKZp3/6N2jKYVxZv0aNCsxTSVCiK72DTiTYZAu7sjg73W0/aynWjMbiGd87EQL4WyA8reiJVh92AVla9g==", + "requires": { + "@babel/code-frame": "^7.10.4", + "@babel/generator": "^7.12.1", + "@babel/helper-module-transforms": "^7.12.1", + "@babel/helpers": "^7.12.1", + "@babel/parser": "^7.12.3", + "@babel/template": "^7.10.4", + "@babel/traverse": "^7.12.1", + "@babel/types": "^7.12.1", + "convert-source-map": "^1.7.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.1", + "json5": "^2.1.2", + "lodash": "^4.17.19", + "resolve": "^1.3.2", + "semver": "^5.4.1", + "source-map": "^0.5.0" + }, + "dependencies": { + "debug": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", + "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", + "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==" + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" + } + } + }, + "@babel/generator": { + "version": "7.12.5", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.12.5.tgz", + "integrity": "sha512-m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A==", + "requires": { + "@babel/types": "^7.12.5", + "jsesc": "^2.5.1", + "source-map": "^0.5.0" + }, + "dependencies": { + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" + } + } + }, + "@babel/helper-function-name": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz", + "integrity": "sha512-YdaSyz1n8gY44EmN7x44zBn9zQ1Ry2Y+3GTA+3vH6Mizke1Vw0aWDM66FOYEPw8//qKkmqOckrGgTYa+6sceqQ==", + "requires": { + "@babel/helper-get-function-arity": "^7.10.4", + "@babel/template": "^7.10.4", + "@babel/types": "^7.10.4" + } + }, + "@babel/helper-get-function-arity": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz", + "integrity": "sha512-EkN3YDB+SRDgiIUnNgcmiD361ti+AVbL3f3Henf6dqqUyr5dMsorno0lJWJuLhDhkI5sYEpgj6y9kB8AOU1I2A==", + "requires": { + "@babel/types": "^7.10.4" + } + }, + "@babel/helper-member-expression-to-functions": { + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.1.tgz", + "integrity": "sha512-k0CIe3tXUKTRSoEx1LQEPFU9vRQfqHtl+kf8eNnDqb4AUJEy5pz6aIiog+YWtVm2jpggjS1laH68bPsR+KWWPQ==", + "requires": { + "@babel/types": "^7.12.1" + } + }, + "@babel/helper-module-imports": { + "version": "7.12.5", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz", + "integrity": "sha512-SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA==", + "requires": { + "@babel/types": "^7.12.5" + } + }, + "@babel/helper-module-transforms": { + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.12.1.tgz", + "integrity": "sha512-QQzehgFAZ2bbISiCpmVGfiGux8YVFXQ0abBic2Envhej22DVXV9nCFaS5hIQbkyo1AdGb+gNME2TSh3hYJVV/w==", + "requires": { + "@babel/helper-module-imports": "^7.12.1", + "@babel/helper-replace-supers": "^7.12.1", + "@babel/helper-simple-access": "^7.12.1", + "@babel/helper-split-export-declaration": "^7.11.0", + "@babel/helper-validator-identifier": "^7.10.4", + "@babel/template": "^7.10.4", + "@babel/traverse": "^7.12.1", + "@babel/types": "^7.12.1", + "lodash": "^4.17.19" + } + }, + "@babel/helper-optimise-call-expression": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz", + "integrity": "sha512-n3UGKY4VXwXThEiKrgRAoVPBMqeoPgHVqiHZOanAJCG9nQUL2pLRQirUzl0ioKclHGpGqRgIOkgcIJaIWLpygg==", + "requires": { + "@babel/types": "^7.10.4" + } + }, + "@babel/helper-plugin-utils": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz", + "integrity": "sha512-O4KCvQA6lLiMU9l2eawBPMf1xPP8xPfB3iEQw150hOVTqj/rfXz0ThTb4HEzqQfs2Bmo5Ay8BzxfzVtBrr9dVg==" + }, + "@babel/helper-replace-supers": { + "version": "7.12.5", + "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.5.tgz", + "integrity": "sha512-5YILoed0ZyIpF4gKcpZitEnXEJ9UoDRki1Ey6xz46rxOzfNMAhVIJMoune1hmPVxh40LRv1+oafz7UsWX+vyWA==", + "requires": { + "@babel/helper-member-expression-to-functions": "^7.12.1", + "@babel/helper-optimise-call-expression": "^7.10.4", + "@babel/traverse": "^7.12.5", + "@babel/types": "^7.12.5" + } + }, + "@babel/helper-simple-access": { + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.12.1.tgz", + "integrity": "sha512-OxBp7pMrjVewSSC8fXDFrHrBcJATOOFssZwv16F3/6Xtc138GHybBfPbm9kfiqQHKhYQrlamWILwlDCeyMFEaA==", + "requires": { + "@babel/types": "^7.12.1" + } + }, + "@babel/helper-split-export-declaration": { + "version": "7.11.0", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz", + "integrity": "sha512-74Vejvp6mHkGE+m+k5vHY93FX2cAtrw1zXrZXRlG4l410Nm9PxfEiVTn1PjDPV5SnmieiueY4AFg2xqhNFuuZg==", + "requires": { + "@babel/types": "^7.11.0" + } + }, + "@babel/helper-validator-identifier": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz", + "integrity": "sha512-3U9y+43hz7ZM+rzG24Qe2mufW5KhvFg/NhnNph+i9mgCtdTCtMJuI1TMkrIUiK7Ix4PYlRF9I5dhqaLYA/ADXw==" + }, + "@babel/helpers": { + "version": "7.12.5", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.12.5.tgz", + "integrity": "sha512-lgKGMQlKqA8meJqKsW6rUnc4MdUk35Ln0ATDqdM1a/UpARODdI4j5Y5lVfUScnSNkJcdCRAaWkspykNoFg9sJA==", + "requires": { + "@babel/template": "^7.10.4", + "@babel/traverse": "^7.12.5", + "@babel/types": "^7.12.5" + } + }, + "@babel/highlight": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.10.4.tgz", + "integrity": "sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA==", + "requires": { + "@babel/helper-validator-identifier": "^7.10.4", + "chalk": "^2.0.0", + "js-tokens": "^4.0.0" + } + }, + "@babel/parser": { + "version": "7.12.5", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.12.5.tgz", + "integrity": "sha512-FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ==" + }, + "@babel/plugin-syntax-async-generators": { + "version": "7.8.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-async-generators/-/plugin-syntax-async-generators-7.8.4.tgz", + "integrity": "sha512-tycmZxkGfZaxhMRbXlPXuVFpdWlXpir2W4AMhSJgRKzk/eDlIXOhb2LHWoLpDF7TEHylV5zNhykX6KAgHJmTNw==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + } + }, + "@babel/plugin-syntax-bigint": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-bigint/-/plugin-syntax-bigint-7.8.3.tgz", + "integrity": "sha512-wnTnFlG+YxQm3vDxpGE57Pj0srRU4sHE/mDkt1qv2YJJSeUAec2ma4WLUnUPeKjyrfntVwe/N6dCXpU+zL3Npg==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + } + }, + "@babel/plugin-syntax-class-properties": { + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.12.1.tgz", + "integrity": "sha512-U40A76x5gTwmESz+qiqssqmeEsKvcSyvtgktrm0uzcARAmM9I1jR221f6Oq+GmHrcD+LvZDag1UTOTe2fL3TeA==", + "requires": { + "@babel/helper-plugin-utils": "^7.10.4" + } + }, + "@babel/plugin-syntax-import-meta": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-import-meta/-/plugin-syntax-import-meta-7.10.4.tgz", + "integrity": "sha512-Yqfm+XDx0+Prh3VSeEQCPU81yC+JWZ2pDPFSS4ZdpfZhp4MkFMaDC1UqseovEKwSUpnIL7+vK+Clp7bfh0iD7g==", + "requires": { + "@babel/helper-plugin-utils": "^7.10.4" + } + }, + "@babel/plugin-syntax-json-strings": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-json-strings/-/plugin-syntax-json-strings-7.8.3.tgz", + "integrity": "sha512-lY6kdGpWHvjoe2vk4WrAapEuBR69EMxZl+RoGRhrFGNYVK8mOPAW8VfbT/ZgrFbXlDNiiaxQnAtgVCZ6jv30EA==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + } + }, + "@babel/plugin-syntax-logical-assignment-operators": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz", + "integrity": "sha512-d8waShlpFDinQ5MtvGU9xDAOzKH47+FFoney2baFIoMr952hKOLp1HR7VszoZvOsV/4+RRszNY7D17ba0te0ig==", + "requires": { + "@babel/helper-plugin-utils": "^7.10.4" + } + }, + "@babel/plugin-syntax-nullish-coalescing-operator": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-nullish-coalescing-operator/-/plugin-syntax-nullish-coalescing-operator-7.8.3.tgz", + "integrity": "sha512-aSff4zPII1u2QD7y+F8oDsz19ew4IGEJg9SVW+bqwpwtfFleiQDMdzA/R+UlWDzfnHFCxxleFT0PMIrR36XLNQ==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + } + }, + "@babel/plugin-syntax-numeric-separator": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz", + "integrity": "sha512-9H6YdfkcK/uOnY/K7/aA2xpzaAgkQn37yzWUMRK7OaPOqOpGS1+n0H5hxT9AUw9EsSjPW8SVyMJwYRtWs3X3ug==", + "requires": { + "@babel/helper-plugin-utils": "^7.10.4" + } + }, + "@babel/plugin-syntax-object-rest-spread": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz", + "integrity": "sha512-XoqMijGZb9y3y2XskN+P1wUGiVwWZ5JmoDRwx5+3GmEplNyVM2s2Dg8ILFQm8rWM48orGy5YpI5Bl8U1y7ydlA==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + } + }, + "@babel/plugin-syntax-optional-catch-binding": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-catch-binding/-/plugin-syntax-optional-catch-binding-7.8.3.tgz", + "integrity": "sha512-6VPD0Pc1lpTqw0aKoeRTMiB+kWhAoT24PA+ksWSBrFtl5SIRVpZlwN3NNPQjehA2E/91FV3RjLWoVTglWcSV3Q==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + } + }, + "@babel/plugin-syntax-optional-chaining": { + "version": "7.8.3", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-optional-chaining/-/plugin-syntax-optional-chaining-7.8.3.tgz", + "integrity": "sha512-KoK9ErH1MBlCPxV0VANkXW2/dw4vlbGDrFgz8bmUsBGYkFRcbRwMh6cIJubdPrkxRwuGdtCk0v/wPTKbQgBjkg==", + "requires": { + "@babel/helper-plugin-utils": "^7.8.0" + } + }, + "@babel/plugin-syntax-top-level-await": { + "version": "7.12.1", + "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.1.tgz", + "integrity": "sha512-i7ooMZFS+a/Om0crxZodrTzNEPJHZrlMVGMTEpFAj6rYY/bKCddB0Dk/YxfPuYXOopuhKk/e1jV6h+WUU9XN3A==", + "requires": { + "@babel/helper-plugin-utils": "^7.10.4" + } + }, + "@babel/template": { + "version": "7.10.4", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.10.4.tgz", + "integrity": "sha512-ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA==", + "requires": { + "@babel/code-frame": "^7.10.4", + "@babel/parser": "^7.10.4", + "@babel/types": "^7.10.4" + } + }, + "@babel/traverse": { + "version": "7.12.5", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.5.tgz", + "integrity": "sha512-xa15FbQnias7z9a62LwYAA5SZZPkHIXpd42C6uW68o8uTuua96FHZy1y61Va5P/i83FAAcMpW8+A/QayntzuqA==", + "requires": { + "@babel/code-frame": "^7.10.4", + "@babel/generator": "^7.12.5", + "@babel/helper-function-name": "^7.10.4", + "@babel/helper-split-export-declaration": "^7.11.0", + "@babel/parser": "^7.12.5", + "@babel/types": "^7.12.5", + "debug": "^4.1.0", + "globals": "^11.1.0", + "lodash": "^4.17.19" + }, + "dependencies": { + "debug": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", + "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", + "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==" + } + } + }, + "@babel/types": { + "version": "7.12.6", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.12.6.tgz", + "integrity": "sha512-hwyjw6GvjBLiyy3W0YQf0Z5Zf4NpYejUnKFcfcUhZCSffoBBp30w6wP2Wn6pk31jMYZvcOrB/1b7cGXvEoKogA==", + "requires": { + "@babel/helper-validator-identifier": "^7.10.4", + "lodash": "^4.17.19", + "to-fast-properties": "^2.0.0" + } + }, + "@bcoe/v8-coverage": { + "version": "0.2.3", + "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz", + "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw==" + }, + "@cnakazawa/watch": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/@cnakazawa/watch/-/watch-1.0.4.tgz", + "integrity": "sha512-v9kIhKwjeZThiWrLmj0y17CWoyddASLj9O2yvbZkbvw/N3rWOYy9zkV66ursAoVr0mV15bL8g0c4QZUE6cdDoQ==", + "requires": { + "exec-sh": "^0.3.2", + "minimist": "^1.2.0" + } + }, "@hapi/address": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/@hapi/address/-/address-4.1.0.tgz", @@ -35,6 +384,436 @@ "@hapi/hoek": "^9.0.0" } }, + "@istanbuljs/load-nyc-config": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", + "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==", + "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" + }, + "dependencies": { + "resolve-from": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", + "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==" + } + } + }, + "@istanbuljs/schema": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.2.tgz", + "integrity": "sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw==" + }, + "@jest/console": { + "version": "26.6.2", + "resolved": "https://registry.npmjs.org/@jest/console/-/console-26.6.2.tgz", + "integrity": "sha512-IY1R2i2aLsLr7Id3S6p2BA82GNWryt4oSvEXLAKc+L2zdi89dSkE8xC1C+0kpATG4JhBJREnQOH7/zmccM2B0g==", + "requires": { + "@jest/types": "^26.6.2", + "@types/node": "*", + "chalk": "^4.0.0", + "jest-message-util": "^26.6.2", + "jest-util": "^26.6.2", + "slash": "^3.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, + "@jest/core": { + "version": "26.6.3", + "resolved": "https://registry.npmjs.org/@jest/core/-/core-26.6.3.tgz", + "integrity": "sha512-xvV1kKbhfUqFVuZ8Cyo+JPpipAHHAV3kcDBftiduK8EICXmTFddryy3P7NfZt8Pv37rA9nEJBKCCkglCPt/Xjw==", + "requires": { + "@jest/console": "^26.6.2", + "@jest/reporters": "^26.6.2", + "@jest/test-result": "^26.6.2", + "@jest/transform": "^26.6.2", + "@jest/types": "^26.6.2", + "@types/node": "*", + "ansi-escapes": "^4.2.1", + "chalk": "^4.0.0", + "exit": "^0.1.2", + "graceful-fs": "^4.2.4", + "jest-changed-files": "^26.6.2", + "jest-config": "^26.6.3", + "jest-haste-map": "^26.6.2", + "jest-message-util": "^26.6.2", + "jest-regex-util": "^26.0.0", + "jest-resolve": "^26.6.2", + "jest-resolve-dependencies": "^26.6.3", + "jest-runner": "^26.6.3", + "jest-runtime": "^26.6.3", + "jest-snapshot": "^26.6.2", + "jest-util": "^26.6.2", + "jest-validate": "^26.6.2", + "jest-watcher": "^26.6.2", + "micromatch": "^4.0.2", + "p-each-series": "^2.1.0", + "rimraf": "^3.0.0", + "slash": "^3.0.0", + "strip-ansi": "^6.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, + "@jest/environment": { + "version": "26.6.2", + "resolved": "https://registry.npmjs.org/@jest/environment/-/environment-26.6.2.tgz", + "integrity": "sha512-nFy+fHl28zUrRsCeMB61VDThV1pVTtlEokBRgqPrcT1JNq4yRNIyTHfyht6PqtUvY9IsuLGTrbG8kPXjSZIZwA==", + "requires": { + "@jest/fake-timers": "^26.6.2", + "@jest/types": "^26.6.2", + "@types/node": "*", + "jest-mock": "^26.6.2" + } + }, + "@jest/fake-timers": { + "version": "26.6.2", + "resolved": "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-26.6.2.tgz", + "integrity": "sha512-14Uleatt7jdzefLPYM3KLcnUl1ZNikaKq34enpb5XG9i81JpppDb5muZvonvKyrl7ftEHkKS5L5/eB/kxJ+bvA==", + "requires": { + "@jest/types": "^26.6.2", + "@sinonjs/fake-timers": "^6.0.1", + "@types/node": "*", + "jest-message-util": "^26.6.2", + "jest-mock": "^26.6.2", + "jest-util": "^26.6.2" + } + }, + "@jest/globals": { + "version": "26.6.2", + "resolved": "https://registry.npmjs.org/@jest/globals/-/globals-26.6.2.tgz", + "integrity": "sha512-85Ltnm7HlB/KesBUuALwQ68YTU72w9H2xW9FjZ1eL1U3lhtefjjl5c2MiUbpXt/i6LaPRvoOFJ22yCBSfQ0JIA==", + "requires": { + "@jest/environment": "^26.6.2", + "@jest/types": "^26.6.2", + "expect": "^26.6.2" + } + }, + "@jest/reporters": { + "version": "26.6.2", + "resolved": "https://registry.npmjs.org/@jest/reporters/-/reporters-26.6.2.tgz", + "integrity": "sha512-h2bW53APG4HvkOnVMo8q3QXa6pcaNt1HkwVsOPMBV6LD/q9oSpxNSYZQYkAnjdMjrJ86UuYeLo+aEZClV6opnw==", + "requires": { + "@bcoe/v8-coverage": "^0.2.3", + "@jest/console": "^26.6.2", + "@jest/test-result": "^26.6.2", + "@jest/transform": "^26.6.2", + "@jest/types": "^26.6.2", + "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.3", + "istanbul-lib-report": "^3.0.0", + "istanbul-lib-source-maps": "^4.0.0", + "istanbul-reports": "^3.0.2", + "jest-haste-map": "^26.6.2", + "jest-resolve": "^26.6.2", + "jest-util": "^26.6.2", + "jest-worker": "^26.6.2", + "node-notifier": "^8.0.0", + "slash": "^3.0.0", + "source-map": "^0.6.0", + "string-length": "^4.0.1", + "terminal-link": "^2.0.0", + "v8-to-istanbul": "^7.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, + "@jest/source-map": { + "version": "26.6.2", + "resolved": "https://registry.npmjs.org/@jest/source-map/-/source-map-26.6.2.tgz", + "integrity": "sha512-YwYcCwAnNmOVsZ8mr3GfnzdXDAl4LaenZP5z+G0c8bzC9/dugL8zRmxZzdoTl4IaS3CryS1uWnROLPFmb6lVvA==", + "requires": { + "callsites": "^3.0.0", + "graceful-fs": "^4.2.4", + "source-map": "^0.6.0" + } + }, + "@jest/test-result": { + "version": "26.6.2", + "resolved": "https://registry.npmjs.org/@jest/test-result/-/test-result-26.6.2.tgz", + "integrity": "sha512-5O7H5c/7YlojphYNrK02LlDIV2GNPYisKwHm2QTKjNZeEzezCbwYs9swJySv2UfPMyZ0VdsmMv7jIlD/IKYQpQ==", + "requires": { + "@jest/console": "^26.6.2", + "@jest/types": "^26.6.2", + "@types/istanbul-lib-coverage": "^2.0.0", + "collect-v8-coverage": "^1.0.0" + } + }, + "@jest/test-sequencer": { + "version": "26.6.3", + "resolved": "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-26.6.3.tgz", + "integrity": "sha512-YHlVIjP5nfEyjlrSr8t/YdNfU/1XEt7c5b4OxcXCjyRhjzLYu/rO69/WHPuYcbCWkz8kAeZVZp2N2+IOLLEPGw==", + "requires": { + "@jest/test-result": "^26.6.2", + "graceful-fs": "^4.2.4", + "jest-haste-map": "^26.6.2", + "jest-runner": "^26.6.3", + "jest-runtime": "^26.6.3" + } + }, + "@jest/transform": { + "version": "26.6.2", + "resolved": "https://registry.npmjs.org/@jest/transform/-/transform-26.6.2.tgz", + "integrity": "sha512-E9JjhUgNzvuQ+vVAL21vlyfy12gP0GhazGgJC4h6qUt1jSdUXGWJ1wfu/X7Sd8etSgxV4ovT1pb9v5D6QW4XgA==", + "requires": { + "@babel/core": "^7.1.0", + "@jest/types": "^26.6.2", + "babel-plugin-istanbul": "^6.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": "^26.6.2", + "jest-regex-util": "^26.0.0", + "jest-util": "^26.6.2", + "micromatch": "^4.0.2", + "pirates": "^4.0.1", + "slash": "^3.0.0", + "source-map": "^0.6.1", + "write-file-atomic": "^3.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, + "@jest/types": { + "version": "26.6.2", + "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz", + "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==", + "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" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, "@postman/form-data": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/@postman/form-data/-/form-data-3.1.0.tgz", @@ -61,6 +840,22 @@ "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==", "dev": true }, + "@sinonjs/commons": { + "version": "1.8.1", + "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-1.8.1.tgz", + "integrity": "sha512-892K+kWUUi3cl+LlqEWIDrhvLgdL79tECi8JZUyq6IviKy/DNhuzCRlbHUjxK89f4ypPMMaFnFuR9Ie6DoIMsw==", + "requires": { + "type-detect": "4.0.8" + } + }, + "@sinonjs/fake-timers": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz", + "integrity": "sha512-MZPUxrmFubI36XS1DI3qmI0YdN1gks62JtFZvxR67ljjSNCeK6U08Zx4msEWOXuofgqUt6zPHSi1H9fbjR/NRA==", + "requires": { + "@sinonjs/commons": "^1.7.0" + } + }, "@szmarczak/http-timer": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz", @@ -70,12 +865,116 @@ "defer-to-connect": "^1.0.1" } }, + "@types/babel__core": { + "version": "7.1.12", + "resolved": "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.12.tgz", + "integrity": "sha512-wMTHiiTiBAAPebqaPiPDLFA4LYPKr6Ph0Xq/6rq1Ur3v66HXyG+clfR9CNETkD7MQS8ZHvpQOtA53DLws5WAEQ==", + "requires": { + "@babel/parser": "^7.1.0", + "@babel/types": "^7.0.0", + "@types/babel__generator": "*", + "@types/babel__template": "*", + "@types/babel__traverse": "*" + } + }, + "@types/babel__generator": { + "version": "7.6.2", + "resolved": "https://registry.npmjs.org/@types/babel__generator/-/babel__generator-7.6.2.tgz", + "integrity": "sha512-MdSJnBjl+bdwkLskZ3NGFp9YcXGx5ggLpQQPqtgakVhsWK0hTtNYhjpZLlWQTviGTvF8at+Bvli3jV7faPdgeQ==", + "requires": { + "@babel/types": "^7.0.0" + } + }, + "@types/babel__template": { + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/@types/babel__template/-/babel__template-7.4.0.tgz", + "integrity": "sha512-NTPErx4/FiPCGScH7foPyr+/1Dkzkni+rHiYHHoTjvwou7AQzJkNeD60A9CXRy+ZEN2B1bggmkTMCDb+Mv5k+A==", + "requires": { + "@babel/parser": "^7.1.0", + "@babel/types": "^7.0.0" + } + }, + "@types/babel__traverse": { + "version": "7.0.15", + "resolved": "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.0.15.tgz", + "integrity": "sha512-Pzh9O3sTK8V6I1olsXpCfj2k/ygO2q1X0vhhnDrEQyYLHZesWz+zMZMVcwXLCYf0U36EtmyYaFGPfXlTtDHe3A==", + "requires": { + "@babel/types": "^7.3.0" + } + }, "@types/color-name": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz", "integrity": "sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ==", "dev": true }, + "@types/graceful-fs": { + "version": "4.1.4", + "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.4.tgz", + "integrity": "sha512-mWA/4zFQhfvOA8zWkXobwJvBD7vzcxgrOQ0J5CH1votGqdq9m7+FwtGaqyCZqC3NyyBkc9z4m+iry4LlqcMWJg==", + "requires": { + "@types/node": "*" + } + }, + "@types/istanbul-lib-coverage": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz", + "integrity": "sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw==" + }, + "@types/istanbul-lib-report": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@types/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz", + "integrity": "sha512-plGgXAPfVKFoYfa9NpYDAkseG+g6Jr294RqeqcqDixSbU34MZVJRi/P+7Y8GDpzkEwLaGZZOpKIEmeVZNtKsrg==", + "requires": { + "@types/istanbul-lib-coverage": "*" + } + }, + "@types/istanbul-reports": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.0.tgz", + "integrity": "sha512-nwKNbvnwJ2/mndE9ItP/zc2TCzw6uuodnF4EHYWD+gCQDVBuRQL5UzbZD0/ezy1iKsFU2ZQiDqg4M9dN4+wZgA==", + "requires": { + "@types/istanbul-lib-report": "*" + } + }, + "@types/node": { + "version": "14.14.7", + "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.7.tgz", + "integrity": "sha512-Zw1vhUSQZYw+7u5dAwNbIA9TuTotpzY/OF7sJM9FqPOF3SPjKnxrjoTktXDZgUjybf4cWVBP7O8wvKdSaGHweg==" + }, + "@types/normalize-package-data": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz", + "integrity": "sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==" + }, + "@types/prettier": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@types/prettier/-/prettier-2.1.5.tgz", + "integrity": "sha512-UEyp8LwZ4Dg30kVU2Q3amHHyTn1jEdhCIE59ANed76GaT1Vp76DD3ZWSAxgCrw6wJ0TqeoBpqmfUHiUDPs//HQ==" + }, + "@types/stack-utils": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.0.tgz", + "integrity": "sha512-RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw==" + }, + "@types/yargs": { + "version": "15.0.9", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.9.tgz", + "integrity": "sha512-HmU8SeIRhZCWcnRskCs36Q1Q00KBV6Cqh/ora8WN1+22dY07AZdn6Gel8QZ3t26XYPImtcL8WV/eqjhVmMEw4g==", + "requires": { + "@types/yargs-parser": "*" + } + }, + "@types/yargs-parser": { + "version": "15.0.0", + "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-15.0.0.tgz", + "integrity": "sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==" + }, + "abab": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz", + "integrity": "sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q==" + }, "abbrev": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-1.1.1.tgz", @@ -91,6 +990,25 @@ "negotiator": "0.6.2" } }, + "acorn": { + "version": "7.4.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz", + "integrity": "sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==" + }, + "acorn-globals": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/acorn-globals/-/acorn-globals-6.0.0.tgz", + "integrity": "sha512-ZQl7LOWaF5ePqqcX4hLuv/bLXYQNfNWw2c0/yX/TsPRKamzHcTGQnlCjHT3TsmkOUVEPS3crCxiPfdzE/Trlhg==", + "requires": { + "acorn": "^7.1.1", + "acorn-walk": "^7.1.1" + } + }, + "acorn-walk": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz", + "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==" + }, "ansi-align": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.0.tgz", @@ -140,11 +1058,25 @@ } } }, + "ansi-escapes": { + "version": "4.3.1", + "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz", + "integrity": "sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==", + "requires": { + "type-fest": "^0.11.0" + }, + "dependencies": { + "type-fest": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.11.0.tgz", + "integrity": "sha512-OdjXJxnCN1AvyLSzeKIgXTXxV+99ZuXl3Hpo9XpJAv9MBcHrrJOQ5kV7ypXOuQie+AmWG25hLbiKdwYTifzcfQ==" + } + } + }, "ansi-regex": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz", - "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==", - "dev": true + "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==" }, "ansi-styles": { "version": "3.2.1", @@ -158,12 +1090,34 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.1.tgz", "integrity": "sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==", - "dev": true, "requires": { "normalize-path": "^3.0.0", "picomatch": "^2.0.4" } }, + "argparse": { + "version": "1.0.10", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", + "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", + "requires": { + "sprintf-js": "~1.0.2" + } + }, + "arr-diff": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/arr-diff/-/arr-diff-4.0.0.tgz", + "integrity": "sha1-1kYQdP6/7HHn4VI1dhoyml3HxSA=" + }, + "arr-flatten": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/arr-flatten/-/arr-flatten-1.1.0.tgz", + "integrity": "sha512-L3hKV5R/p5o81R7O02IGnwpDmkp6E982XhtbuwSe3O4qOtMMMtodicASA1Cny2U+aCXcNpml+m4dPsvsJ3jatg==" + }, + "arr-union": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/arr-union/-/arr-union-3.1.0.tgz", + "integrity": "sha1-45sJrqne+Gao8gbiiK9jkZuuOcQ=" + }, "array-flatten": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", @@ -175,6 +1129,11 @@ "integrity": "sha1-r2rId6Jcx/dOBYiUdThY39sk/bY=", "dev": true }, + "array-unique": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", + "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=" + }, "asn1": { "version": "0.2.4", "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", @@ -188,6 +1147,11 @@ "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=" }, + "assign-symbols": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz", + "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=" + }, "async": { "version": "1.5.2", "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", @@ -198,6 +1162,11 @@ "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", "integrity": "sha1-x57Zf380y48robyXkLzDZkdLS3k=" }, + "atob": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/atob/-/atob-2.1.2.tgz", + "integrity": "sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==" + }, "aws-sign2": { "version": "0.7.0", "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", @@ -208,11 +1177,172 @@ "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.9.1.tgz", "integrity": "sha512-wMHVg2EOHaMRxbzgFJ9gtjOOCrI80OHLG14rxi28XwOW8ux6IiEbRCGGGqCtdAIg4FQCbW20k9RsT4y3gJlFug==" }, + "babel-jest": { + "version": "26.6.3", + "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-26.6.3.tgz", + "integrity": "sha512-pl4Q+GAVOHwvjrck6jKjvmGhnO3jHX/xuB9d27f+EJZ/6k+6nMuPjorrYp7s++bKKdANwzElBWnLWaObvTnaZA==", + "requires": { + "@jest/transform": "^26.6.2", + "@jest/types": "^26.6.2", + "@types/babel__core": "^7.1.7", + "babel-plugin-istanbul": "^6.0.0", + "babel-preset-jest": "^26.6.2", + "chalk": "^4.0.0", + "graceful-fs": "^4.2.4", + "slash": "^3.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, + "babel-plugin-istanbul": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.0.0.tgz", + "integrity": "sha512-AF55rZXpe7trmEylbaE1Gv54wn6rwU03aptvRoVIGP8YykoSxqdVLV1TfwflBCE/QtHmqtP8SWlTENqbK8GCSQ==", + "requires": { + "@babel/helper-plugin-utils": "^7.0.0", + "@istanbuljs/load-nyc-config": "^1.0.0", + "@istanbuljs/schema": "^0.1.2", + "istanbul-lib-instrument": "^4.0.0", + "test-exclude": "^6.0.0" + } + }, + "babel-plugin-jest-hoist": { + "version": "26.6.2", + "resolved": "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.6.2.tgz", + "integrity": "sha512-PO9t0697lNTmcEHH69mdtYiOIkkOlj9fySqfO3K1eCcdISevLAE0xY59VLLUj0SoiPiTX/JU2CYFpILydUa5Lw==", + "requires": { + "@babel/template": "^7.3.3", + "@babel/types": "^7.3.3", + "@types/babel__core": "^7.0.0", + "@types/babel__traverse": "^7.0.6" + } + }, + "babel-preset-current-node-syntax": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.0.tgz", + "integrity": "sha512-mGkvkpocWJes1CmMKtgGUwCeeq0pOhALyymozzDWYomHTbDLwueDYG6p4TK1YOeYHCzBzYPsWkgTto10JubI1Q==", + "requires": { + "@babel/plugin-syntax-async-generators": "^7.8.4", + "@babel/plugin-syntax-bigint": "^7.8.3", + "@babel/plugin-syntax-class-properties": "^7.8.3", + "@babel/plugin-syntax-import-meta": "^7.8.3", + "@babel/plugin-syntax-json-strings": "^7.8.3", + "@babel/plugin-syntax-logical-assignment-operators": "^7.8.3", + "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.3", + "@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-top-level-await": "^7.8.3" + } + }, + "babel-preset-jest": { + "version": "26.6.2", + "resolved": "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-26.6.2.tgz", + "integrity": "sha512-YvdtlVm9t3k777c5NPQIv6cxFFFapys25HiUmuSgHwIZhfifweR5c5Sf5nwE3MAbfu327CYSvps8Yx6ANLyleQ==", + "requires": { + "babel-plugin-jest-hoist": "^26.6.2", + "babel-preset-current-node-syntax": "^1.0.0" + } + }, "balanced-match": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=" }, + "base": { + "version": "0.11.2", + "resolved": "https://registry.npmjs.org/base/-/base-0.11.2.tgz", + "integrity": "sha512-5T6P4xPgpp0YDFvSWwEZ4NoE3aM4QBQXDzmVbraCkFj8zHM+mba8SyqB5DbZWyR7mYHo6Y7BdQo3MoA4m0TeQg==", + "requires": { + "cache-base": "^1.0.1", + "class-utils": "^0.3.5", + "component-emitter": "^1.2.1", + "define-property": "^1.0.0", + "isobject": "^3.0.1", + "mixin-deep": "^1.2.0", + "pascalcase": "^0.1.1" + }, + "dependencies": { + "define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", + "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", + "requires": { + "is-descriptor": "^1.0.0" + } + }, + "is-accessor-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", + "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", + "requires": { + "kind-of": "^6.0.0" + } + }, + "is-data-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", + "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", + "requires": { + "kind-of": "^6.0.0" + } + }, + "is-descriptor": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", + "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", + "requires": { + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" + } + } + } + }, "base64-js": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.1.tgz", @@ -354,7 +1484,6 @@ "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" } @@ -368,6 +1497,19 @@ "base64-js": "^1.1.2" } }, + "browser-process-hrtime": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz", + "integrity": "sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==" + }, + "bser": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/bser/-/bser-2.1.1.tgz", + "integrity": "sha512-gQxTNE/GAfIIrmHLUE3oJyp5FO6HRBfhjnw4/wMmA63ZGDJnWBmgY/lyQBpnDUkGmAhbSe39tx2d/iTOAfglwQ==", + "requires": { + "node-int64": "^0.4.0" + } + }, "bson": { "version": "1.1.5", "resolved": "https://registry.npmjs.org/bson/-/bson-1.1.5.tgz", @@ -378,11 +1520,32 @@ "resolved": "https://registry.npmjs.org/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz", "integrity": "sha1-+OcRMvf/5uAaXJaXpMbz5I1cyBk=" }, + "buffer-from": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.1.tgz", + "integrity": "sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==" + }, "bytes": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz", "integrity": "sha512-zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg==" }, + "cache-base": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/cache-base/-/cache-base-1.0.1.tgz", + "integrity": "sha512-AKcdTnFSWATd5/GCPRxr2ChwIJ85CeyrEyjRHlKxQ56d4XJMGym0uAiKn0xbLOGOl3+yRpOTi484dVCEc5AUzQ==", + "requires": { + "collection-visit": "^1.0.0", + "component-emitter": "^1.2.1", + "get-value": "^2.0.6", + "has-value": "^1.0.0", + "isobject": "^3.0.1", + "set-value": "^2.0.0", + "to-object-path": "^0.3.0", + "union-value": "^1.0.0", + "unset-value": "^1.0.0" + } + }, "cacheable-request": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz", @@ -415,11 +1578,23 @@ } } }, + "callsites": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==" + }, "camelcase": { "version": "5.3.1", "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", - "dev": true + "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==" + }, + "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==", + "requires": { + "rsvp": "^4.8.4" + } }, "caseless": { "version": "0.12.0", @@ -436,6 +1611,11 @@ "supports-color": "^5.3.0" } }, + "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==" + }, "chardet": { "version": "1.2.1", "resolved": "https://registry.npmjs.org/chardet/-/chardet-1.2.1.tgz", @@ -467,8 +1647,33 @@ "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 + "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ==" + }, + "cjs-module-lexer": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-0.6.0.tgz", + "integrity": "sha512-uc2Vix1frTfnuzxxu1Hp4ktSvM3QaI4oXl4ZUqL1wjTu/BGki9TrCWoqLTg/drR1KwAEarXuRFCG2Svr1GxPFw==" + }, + "class-utils": { + "version": "0.3.6", + "resolved": "https://registry.npmjs.org/class-utils/-/class-utils-0.3.6.tgz", + "integrity": "sha512-qOhPa/Fj7s6TY8H8esGu5QNpMMQxz79h+urzrNYN6mn+9BnxlDGf5QZ+XeCDsxSjPqsSR56XOZOJmpeurnLMeg==", + "requires": { + "arr-union": "^3.1.0", + "define-property": "^0.2.5", + "isobject": "^3.0.0", + "static-extend": "^0.1.1" + }, + "dependencies": { + "define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "requires": { + "is-descriptor": "^0.1.0" + } + } + } }, "cli-boxes": { "version": "2.2.0", @@ -497,6 +1702,16 @@ "string-width": "^4.2.0" } }, + "cliui": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", + "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==", + "requires": { + "string-width": "^4.2.0", + "strip-ansi": "^6.0.0", + "wrap-ansi": "^6.2.0" + } + }, "clone-response": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz", @@ -506,6 +1721,25 @@ "mimic-response": "^1.0.0" } }, + "co": { + "version": "4.6.0", + "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", + "integrity": "sha1-bqa989hTrlTMuOR7+gvz+QMfsYQ=" + }, + "collect-v8-coverage": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.1.tgz", + "integrity": "sha512-iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg==" + }, + "collection-visit": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/collection-visit/-/collection-visit-1.0.0.tgz", + "integrity": "sha1-S8A3PBZLwykbTTaMgpzxqApZ3KA=", + "requires": { + "map-visit": "^1.0.0", + "object-visit": "^1.0.0" + } + }, "color-convert": { "version": "1.9.3", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", @@ -539,6 +1773,11 @@ "integrity": "sha512-wl7PNrYWd2y5mp1OK/LhTlv8Ff4kQJQRXXAvF+uU/TPNiVJUxZLRYGj/B0y/lPGAVcSbJqH2Za/cvHmrPMC8mA==", "dev": true }, + "component-emitter": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.0.tgz", + "integrity": "sha512-Rd3se6QB+sO1TwqZjscQrurpEPIfO0/yYnSin6Q/rD3mOutHvUrCAhJub3r90uNb+SESBuE0QYoB90YdfatsRg==" + }, "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", @@ -571,6 +1810,14 @@ "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz", "integrity": "sha512-hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA==" }, + "convert-source-map": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.7.0.tgz", + "integrity": "sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==", + "requires": { + "safe-buffer": "~5.1.1" + } + }, "cookie": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz", @@ -581,6 +1828,11 @@ "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", "integrity": "sha1-4wOogrNCzD7oylE6eZmXNNqzriw=" }, + "copy-descriptor": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/copy-descriptor/-/copy-descriptor-0.1.1.tgz", + "integrity": "sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=" + }, "core-util-is": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz", @@ -595,12 +1847,44 @@ "vary": "^1" } }, + "cross-spawn": { + "version": "6.0.5", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", + "integrity": "sha512-eTVLrBSt7fjbDygz805pMnstIs2VTBNkRm0qxZd+M7A5XDdxVRWO5MxGBXZhjY4cqLYLdtrGqRf8mBPmzwSpWQ==", + "requires": { + "nice-try": "^1.0.4", + "path-key": "^2.0.1", + "semver": "^5.5.0", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + }, "crypto-random-string": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz", "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==", "dev": true }, + "cssom": { + "version": "0.4.4", + "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.4.4.tgz", + "integrity": "sha512-p3pvU7r1MyyqbTk+WbNJIgJjG2VmTIaB10rI93LzVPrmDJKkzKYMtxxyAvQXR/NS6otuzveI7+7BBq3SjBS2mw==" + }, + "cssstyle": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz", + "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==", + "requires": { + "cssom": "~0.3.6" + }, + "dependencies": { + "cssom": { + "version": "0.3.8", + "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz", + "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg==" + } + } + }, "csv-parse": { "version": "4.12.0", "resolved": "https://registry.npmjs.org/csv-parse/-/csv-parse-4.12.0.tgz", @@ -615,6 +1899,16 @@ "assert-plus": "^1.0.0" } }, + "data-urls": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-2.0.0.tgz", + "integrity": "sha512-X5eWTSXO/BJmpdIKCRuKUgSCgAN0OwliVK3yPKbwIWU1Tdw5BRajxlzMidvh+gwko9AfQ9zIj52pzF91Q3YAvQ==", + "requires": { + "abab": "^2.0.3", + "whatwg-mimetype": "^2.3.0", + "whatwg-url": "^8.0.0" + } + }, "dbug": { "version": "0.4.2", "resolved": "https://registry.npmjs.org/dbug/-/dbug-0.4.2.tgz", @@ -629,6 +1923,21 @@ "ms": "2.0.0" } }, + "decamelize": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", + "integrity": "sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=" + }, + "decimal.js": { + "version": "10.2.1", + "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.2.1.tgz", + "integrity": "sha512-KaL7+6Fw6i5A2XSnsbhm/6B+NuEA7TZ4vqxnd5tXz9sbKtrN9Srj8ab4vKVdK8YAqZO9P1kg45Y6YLoduPf+kw==" + }, + "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=" + }, "decompress-response": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz", @@ -644,12 +1953,59 @@ "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", "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=" + }, + "deepmerge": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.2.2.tgz", + "integrity": "sha512-FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg==" + }, "defer-to-connect": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz", "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==", "dev": true }, + "define-property": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz", + "integrity": "sha512-jwK2UV4cnPpbcG7+VRARKTZPUWowwXA8bzH5NP6ud0oeAxyYPuGZUAC7hMugpCdz4BeSZl2Dl9k66CHJ/46ZYQ==", + "requires": { + "is-descriptor": "^1.0.2", + "isobject": "^3.0.1" + }, + "dependencies": { + "is-accessor-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", + "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", + "requires": { + "kind-of": "^6.0.0" + } + }, + "is-data-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", + "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", + "requires": { + "kind-of": "^6.0.0" + } + }, + "is-descriptor": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", + "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", + "requires": { + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" + } + } + } + }, "delayed-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", @@ -670,6 +2026,16 @@ "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=" }, + "detect-newline": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz", + "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==" + }, + "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==" + }, "dom-serializer": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz", @@ -700,6 +2066,21 @@ "integrity": "sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==", "dev": true }, + "domexception": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/domexception/-/domexception-2.0.1.tgz", + "integrity": "sha512-yxJ2mFy/sibVQlu5qHjOkf9J3K6zgmCxgJ94u2EdvDOV09H+32LtRswEcUsmUWN72pVLOEnTSRaIVVzVQgS0dg==", + "requires": { + "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==" + } + } + }, "domhandler": { "version": "2.4.2", "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-2.4.2.tgz", @@ -764,11 +2145,15 @@ "jake": "^10.6.1" } }, + "emittery": { + "version": "0.7.2", + "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.7.2.tgz", + "integrity": "sha512-A8OG5SR/ij3SsJdWDJdkkSYUjQdCUx6APQXem0SaEePBSRg4eymGYwBkKo1Y6DU+af/Jn2dBQqDBvjnr9Vi8nQ==" + }, "emoji-regex": { "version": "8.0.0", "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", - "dev": true + "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==" }, "encodeurl": { "version": "1.0.2", @@ -779,7 +2164,6 @@ "version": "1.4.4", "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz", "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==", - "dev": true, "requires": { "once": "^1.4.0" } @@ -790,6 +2174,14 @@ "integrity": "sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w==", "dev": true }, + "error-ex": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz", + "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==", + "requires": { + "is-arrayish": "^0.2.1" + } + }, "errorhandler": { "version": "1.5.1", "resolved": "https://registry.npmjs.org/errorhandler/-/errorhandler-1.5.1.tgz", @@ -815,6 +2207,33 @@ "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", "integrity": "sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=" }, + "escodegen": { + "version": "1.14.3", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.14.3.tgz", + "integrity": "sha512-qFcX0XJkdg+PB3xjZZG/wKSuT1PnQWx57+TVSjIMmILd2yC/6ByYElPwJnslDsuWuSAp4AwJGumarAAmJch5Kw==", + "requires": { + "esprima": "^4.0.1", + "estraverse": "^4.2.0", + "esutils": "^2.0.2", + "optionator": "^0.8.1", + "source-map": "~0.6.1" + } + }, + "esprima": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", + "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==" + }, + "estraverse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", + "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==" + }, + "esutils": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==" + }, "etag": { "version": "1.8.1", "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", @@ -826,6 +2245,98 @@ "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==", "dev": true }, + "exec-sh": { + "version": "0.3.4", + "resolved": "https://registry.npmjs.org/exec-sh/-/exec-sh-0.3.4.tgz", + "integrity": "sha512-sEFIkc61v75sWeOe72qyrqg2Qg0OuLESziUDk/O/z2qgS15y2gWVFrI6f2Qn/qw/0/NCfCEsmNA4zOjkwEZT1A==" + }, + "execa": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz", + "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==", + "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" + } + }, + "exit": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz", + "integrity": "sha1-BjJjj42HfMghB9MKD/8aF8uhzQw=" + }, + "expand-brackets": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz", + "integrity": "sha1-t3c14xXOMPa27/D4OwQVGiJEliI=", + "requires": { + "debug": "^2.3.3", + "define-property": "^0.2.5", + "extend-shallow": "^2.0.1", + "posix-character-classes": "^0.1.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" + }, + "dependencies": { + "define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "requires": { + "is-descriptor": "^0.1.0" + } + }, + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "requires": { + "is-extendable": "^0.1.0" + } + } + } + }, + "expect": { + "version": "26.6.2", + "resolved": "https://registry.npmjs.org/expect/-/expect-26.6.2.tgz", + "integrity": "sha512-9/hlOBkQl2l/PLHJx6JjoDF6xPKcJEsUlWKb23rKE7KzeDqUZKXKNMW27KIue5JMdBV9HgmoJPcc8HtO85t9IA==", + "requires": { + "@jest/types": "^26.6.2", + "ansi-styles": "^4.0.0", + "jest-get-type": "^26.3.0", + "jest-matcher-utils": "^26.6.2", + "jest-message-util": "^26.6.2", + "jest-regex-util": "^26.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "requires": { + "color-convert": "^2.0.1" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + } + } + }, "express": { "version": "4.17.1", "resolved": "https://registry.npmjs.org/express/-/express-4.17.1.tgz", @@ -911,6 +2422,84 @@ "resolved": "https://registry.npmjs.org/extend/-/extend-3.0.2.tgz", "integrity": "sha512-fjquC59cD7CyW6urNXK0FBufkZcoiGG80wTuPujX590cB5Ttln20E2UB4S/WARVqhXffZl2LNgS+gQdPIIim/g==" }, + "extend-shallow": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz", + "integrity": "sha1-Jqcarwc7OfshJxcnRhMcJwQCjbg=", + "requires": { + "assign-symbols": "^1.0.0", + "is-extendable": "^1.0.1" + }, + "dependencies": { + "is-extendable": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", + "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", + "requires": { + "is-plain-object": "^2.0.4" + } + } + } + }, + "extglob": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/extglob/-/extglob-2.0.4.tgz", + "integrity": "sha512-Nmb6QXkELsuBr24CJSkilo6UHHgbekK5UiZgfE6UHD3Eb27YC6oD+bhcT+tJ6cl8dmsgdQxnWlcry8ksBIBLpw==", + "requires": { + "array-unique": "^0.3.2", + "define-property": "^1.0.0", + "expand-brackets": "^2.1.4", + "extend-shallow": "^2.0.1", + "fragment-cache": "^0.2.1", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" + }, + "dependencies": { + "define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", + "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", + "requires": { + "is-descriptor": "^1.0.0" + } + }, + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "requires": { + "is-extendable": "^0.1.0" + } + }, + "is-accessor-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", + "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", + "requires": { + "kind-of": "^6.0.0" + } + }, + "is-data-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", + "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", + "requires": { + "kind-of": "^6.0.0" + } + }, + "is-descriptor": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", + "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", + "requires": { + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" + } + } + } + }, "extsprintf": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz", @@ -927,6 +2516,19 @@ "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==" }, + "fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=" + }, + "fb-watchman": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz", + "integrity": "sha512-DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg==", + "requires": { + "bser": "2.1.1" + } + }, "file-type": { "version": "3.9.0", "resolved": "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz", @@ -951,7 +2553,6 @@ "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" } @@ -970,12 +2571,26 @@ "unpipe": "~1.0.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==", + "requires": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + } + }, "flatted": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.1.tgz", "integrity": "sha512-a1hQMktqW9Nmqr5aktAux3JMNqaucxGcjtjWnZLHX7yyPCmlSV3M54nGYbqT8K+0GhF3NBgmJCc3ma+WOgX8Jg==", "dev": true }, + "for-in": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz", + "integrity": "sha1-gQaNKVqBQuwKxybG4iAMMPttXoA=" + }, "forever-agent": { "version": "0.6.1", "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz", @@ -996,27 +2611,63 @@ "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.1.2.tgz", "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=" }, + "fragment-cache": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz", + "integrity": "sha1-QpD60n8T6Jvn8zeZxrxaCr//DRk=", + "requires": { + "map-cache": "^0.2.2" + } + }, "fresh": { "version": "0.5.2", "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", "integrity": "sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=" }, + "fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=" + }, "fsevents": { "version": "2.1.3", "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.1.3.tgz", "integrity": "sha512-Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ==", - "dev": true, "optional": true }, + "function-bind": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", + "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" + }, + "gensync": { + "version": "1.0.0-beta.2", + "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", + "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==" + }, + "get-caller-file": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", + "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==" + }, + "get-package-type": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz", + "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==" + }, "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" } }, + "get-value": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz", + "integrity": "sha1-3BXKHGcjh8p2vTesCjlbogQqLCg=" + }, "getpass": { "version": "0.1.7", "resolved": "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz", @@ -1025,6 +2676,19 @@ "assert-plus": "^1.0.0" } }, + "glob": { + "version": "7.1.6", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz", + "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==", + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.0.4", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, "glob-parent": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.1.tgz", @@ -1043,6 +2707,11 @@ "ini": "^1.3.5" } }, + "globals": { + "version": "11.12.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", + "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==" + }, "got": { "version": "9.6.0", "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz", @@ -1065,8 +2734,13 @@ "graceful-fs": { "version": "4.2.4", "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz", - "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==", - "dev": true + "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==" + }, + "growly": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/growly/-/growly-1.3.0.tgz", + "integrity": "sha1-8QdIy+dq+WS3yWyTxrzCivEgwIE=", + "optional": true }, "handlebars": { "version": "4.7.6", @@ -1118,6 +2792,14 @@ } } }, + "has": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/has/-/has-1.0.3.tgz", + "integrity": "sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==", + "requires": { + "function-bind": "^1.1.1" + } + }, "has-ansi": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz", @@ -1140,12 +2822,77 @@ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=" }, + "has-value": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz", + "integrity": "sha1-GLKB2lhbHFxR3vJMkw7SmgvmsXc=", + "requires": { + "get-value": "^2.0.6", + "has-values": "^1.0.0", + "isobject": "^3.0.0" + } + }, + "has-values": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz", + "integrity": "sha1-lbC2P+whRmGab+V/51Yo1aOe/k8=", + "requires": { + "is-number": "^3.0.0", + "kind-of": "^4.0.0" + }, + "dependencies": { + "is-number": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + "requires": { + "kind-of": "^3.0.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "requires": { + "is-buffer": "^1.1.5" + } + } + } + }, + "kind-of": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz", + "integrity": "sha1-IIE989cSkosgc3hpGkUGb65y3Vc=", + "requires": { + "is-buffer": "^1.1.5" + } + } + } + }, "has-yarn": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/has-yarn/-/has-yarn-2.1.0.tgz", "integrity": "sha512-UqBRqi4ju7T+TqGNdqAO0PaSVGsDGJUBQvk9eUWNGRY1CFGDzYhLWoM7JQEemnlvVcv/YEmc2wNW8BC24EnUsw==", "dev": true }, + "hosted-git-info": { + "version": "2.8.8", + "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.8.8.tgz", + "integrity": "sha512-f/wzC2QaWBs7t9IYqB4T3sR1xviIViXJRJTWBlx2Gf3g0Xi5vI7Yy4koXQ1c9OYDGHN9sBy1DQ2AB8fqZBWhUg==" + }, + "html-encoding-sniffer": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz", + "integrity": "sha512-D5JbOMBIR/TVZkubHT+OyT2705QvogUW4IBn6nHd756OwieSF9aDYFj4dv6HHEVGYbHaLETa3WggZYWWMyy3ZQ==", + "requires": { + "whatwg-encoding": "^1.0.5" + } + }, + "html-escaper": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", + "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==" + }, "htmlparser2": { "version": "3.10.1", "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.10.1.tgz", @@ -1231,6 +2978,11 @@ "integrity": "sha1-QzX/2CzZaWaKOUZckprGHWOTYn8=", "dev": true }, + "human-signals": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-1.1.1.tgz", + "integrity": "sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==" + }, "iconv-lite": { "version": "0.4.24", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", @@ -1251,11 +3003,28 @@ "integrity": "sha1-BWmOPUXIjo1+nZLLBYTnfwlvPkM=", "dev": true }, + "import-local": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.2.tgz", + "integrity": "sha512-vjL3+w0oulAVZ0hBHnxa/Nm5TAurf9YLQJDhqRZyqb+VKGOB6LU8t9H1Nr5CIo16vh9XfJTOoHwU0B71S557gA==", + "requires": { + "pkg-dir": "^4.2.0", + "resolve-cwd": "^3.0.0" + } + }, "imurmurhash": { "version": "0.1.4", "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=", - "dev": true + "integrity": "sha1-khi5srkoojixPcT7a21XbyMUU+o=" + }, + "inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "requires": { + "once": "^1.3.0", + "wrappy": "1" + } }, "inherits": { "version": "2.0.3", @@ -1327,14 +3096,36 @@ "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 + "integrity": "sha1-+ni/XS5pE8kRzp+BnuUUa7bYROk=" }, "ipaddr.js": { "version": "1.9.1", "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==" }, + "is-accessor-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz", + "integrity": "sha1-qeEss66Nh2cn7u84Q/igiXtcmNY=", + "requires": { + "kind-of": "^3.0.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "requires": { + "is-buffer": "^1.1.5" + } + } + } + }, + "is-arrayish": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", + "integrity": "sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=" + }, "is-binary-path": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", @@ -1344,15 +3135,73 @@ "binary-extensions": "^2.0.0" } }, + "is-buffer": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", + "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==" + }, "is-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-core-module": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.1.0.tgz", + "integrity": "sha512-YcV7BgVMRFRua2FqQzKtTDMz8iCuLEyGKjr70q8Zm1yy2qKcurbFEd79PAdHV77oL3NrAaOVQIbMmiHQCHB7ZA==", + "requires": { + "has": "^1.0.3" + } + }, + "is-data-descriptor": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz", + "integrity": "sha1-C17mSDiOLIYCgueT8YVv7D8wG1Y=", + "requires": { + "kind-of": "^3.0.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "requires": { + "is-buffer": "^1.1.5" + } + } + } + }, + "is-descriptor": { + "version": "0.1.6", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", + "integrity": "sha512-avDYr0SB3DwO9zsMov0gKCESFYqCnE4hq/4z3TdUlukEy5t9C0YRq7HLrsN52NAcqXKaepeCD0n+B0arnVG3Hg==", + "requires": { + "is-accessor-descriptor": "^0.1.6", + "is-data-descriptor": "^0.1.4", + "kind-of": "^5.0.0" + }, + "dependencies": { + "kind-of": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-5.1.0.tgz", + "integrity": "sha512-NGEErnH6F2vUuXDh+OlbcKW7/wOcfdRHaZ7VWtqCztfHri/++YKmP51OdWeGPuqCOba6kk2OTe5d02VmTB80Pw==" + } + } + }, + "is-docker": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.1.1.tgz", + "integrity": "sha512-ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw==", + "optional": true + }, + "is-extendable": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz", + "integrity": "sha1-YrEQ4omkcUGOPsNqYX1HLjAd/Ik=" + }, "is-extglob": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", @@ -1362,8 +3211,12 @@ "is-fullwidth-code-point": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", - "dev": true + "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==" + }, + "is-generator-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz", + "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==" }, "is-glob": { "version": "4.0.1", @@ -1393,8 +3246,7 @@ "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 + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==" }, "is-obj": { "version": "2.0.0", @@ -1408,11 +3260,43 @@ "integrity": "sha512-/2UGPSgmtqwo1ktx8NDHjuPwZWmHhO+gj0f93EkhLB5RgW9RZevWYYlIkS6zePc6U2WpOdQYIwHe9YC4DWEBVg==", "dev": true }, + "is-plain-object": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", + "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", + "requires": { + "isobject": "^3.0.1" + } + }, + "is-potential-custom-element-name": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz", + "integrity": "sha1-DFLlS8yjkbssSUsh6GJtczbG45c=" + }, + "is-stream": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", + "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=" + }, "is-typedarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", "integrity": "sha1-5HnICFjfDBsR3dppQPlgEfzaSpo=" }, + "is-windows": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", + "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==" + }, + "is-wsl": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz", + "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==", + "optional": true, + "requires": { + "is-docker": "^2.0.0" + } + }, "is-yarn-global": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/is-yarn-global/-/is-yarn-global-0.3.0.tgz", @@ -1424,11 +3308,103 @@ "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=" }, + "isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=" + }, + "isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha1-TkMekrEalzFjaqH5yNHMvP2reN8=" + }, "isstream": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", "integrity": "sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo=" }, + "istanbul-lib-coverage": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.0.0.tgz", + "integrity": "sha512-UiUIqxMgRDET6eR+o5HbfRYP1l0hqkWOs7vNxC/mggutCMUIhWMm8gAHb8tHlyfD3/l6rlgNA5cKdDzEAf6hEg==" + }, + "istanbul-lib-instrument": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz", + "integrity": "sha512-BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ==", + "requires": { + "@babel/core": "^7.7.5", + "@istanbuljs/schema": "^0.1.2", + "istanbul-lib-coverage": "^3.0.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==" + } + } + }, + "istanbul-lib-report": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.0.tgz", + "integrity": "sha512-wcdi+uAKzfiGT2abPpKZ0hSU1rGQjUQnLvtY5MpQ7QCTahD3VODhcu4wcfY1YtkGaDD5yuydOLINXsfbus9ROw==", + "requires": { + "istanbul-lib-coverage": "^3.0.0", + "make-dir": "^3.0.0", + "supports-color": "^7.1.0" + }, + "dependencies": { + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, + "istanbul-lib-source-maps": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.0.tgz", + "integrity": "sha512-c16LpFRkR8vQXyHZ5nLpY35JZtzj1PQY1iZmesUbf1FZHbIupcWfjgOXBY9YHkLEQ6puz1u4Dgj6qmU/DisrZg==", + "requires": { + "debug": "^4.1.1", + "istanbul-lib-coverage": "^3.0.0", + "source-map": "^0.6.1" + }, + "dependencies": { + "debug": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", + "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", + "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==" + } + } + }, + "istanbul-reports": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.0.2.tgz", + "integrity": "sha512-9tZvz7AiR3PEDNGiV9vIouQ/EAcqMXFmkcA1CDFTwOB98OZVDL0PH9glHotf5Ugp6GCOTypfzGWI/OqjWNCRUw==", + "requires": { + "html-escaper": "^2.0.0", + "istanbul-lib-report": "^3.0.0" + } + }, "jake": { "version": "10.8.2", "resolved": "https://registry.npmjs.org/jake/-/jake-10.8.2.tgz", @@ -1447,6 +3423,1133 @@ } } }, + "jest": { + "version": "26.6.3", + "resolved": "https://registry.npmjs.org/jest/-/jest-26.6.3.tgz", + "integrity": "sha512-lGS5PXGAzR4RF7V5+XObhqz2KZIDUA1yD0DG6pBVmy10eh0ZIXQImRuzocsI/N2XZ1GrLFwTS27In2i2jlpq1Q==", + "requires": { + "@jest/core": "^26.6.3", + "import-local": "^3.0.2", + "jest-cli": "^26.6.3" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" + }, + "jest-cli": { + "version": "26.6.3", + "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-26.6.3.tgz", + "integrity": "sha512-GF9noBSa9t08pSyl3CY4frMrqp+aQXFGFkf5hEPbh/pIUFYWMK6ZLTfbmadxJVcJrdRoChlWQsA2VkJcDFK8hg==", + "requires": { + "@jest/core": "^26.6.3", + "@jest/test-result": "^26.6.2", + "@jest/types": "^26.6.2", + "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": "^26.6.3", + "jest-util": "^26.6.2", + "jest-validate": "^26.6.2", + "prompts": "^2.0.1", + "yargs": "^15.4.1" + } + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, + "jest-changed-files": { + "version": "26.6.2", + "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-26.6.2.tgz", + "integrity": "sha512-fDS7szLcY9sCtIip8Fjry9oGf3I2ht/QT21bAHm5Dmf0mD4X3ReNUf17y+bO6fR8WgbIZTlbyG1ak/53cbRzKQ==", + "requires": { + "@jest/types": "^26.6.2", + "execa": "^4.0.0", + "throat": "^5.0.0" + }, + "dependencies": { + "cross-spawn": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "requires": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + } + }, + "execa": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz", + "integrity": "sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==", + "requires": { + "cross-spawn": "^7.0.0", + "get-stream": "^5.0.0", + "human-signals": "^1.1.1", + "is-stream": "^2.0.0", + "merge-stream": "^2.0.0", + "npm-run-path": "^4.0.0", + "onetime": "^5.1.0", + "signal-exit": "^3.0.2", + "strip-final-newline": "^2.0.0" + } + }, + "get-stream": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.2.0.tgz", + "integrity": "sha512-nBF+F1rAZVCu/p7rjzgA+Yb4lfYXrpl7a6VmJrU8wF9I1CKvP/QwPNZHnOlwbTkY6dvtFIzFMSyQXbLoTQPRpA==", + "requires": { + "pump": "^3.0.0" + } + }, + "is-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.0.tgz", + "integrity": "sha512-XCoy+WlUr7d1+Z8GgSuXmpuUFC9fOhRXglJMx+dwLKTkL44Cjd4W1Z5P+BQZpr+cR93aGP4S/s7Ftw6Nd/kiEw==" + }, + "npm-run-path": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz", + "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==", + "requires": { + "path-key": "^3.0.0" + } + }, + "path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==" + }, + "shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "requires": { + "shebang-regex": "^3.0.0" + } + }, + "shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==" + }, + "which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "requires": { + "isexe": "^2.0.0" + } + } + } + }, + "jest-config": { + "version": "26.6.3", + "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-26.6.3.tgz", + "integrity": "sha512-t5qdIj/bCj2j7NFVHb2nFB4aUdfucDn3JRKgrZnplb8nieAirAzRSHP8uDEd+qV6ygzg9Pz4YG7UTJf94LPSyg==", + "requires": { + "@babel/core": "^7.1.0", + "@jest/test-sequencer": "^26.6.3", + "@jest/types": "^26.6.2", + "babel-jest": "^26.6.3", + "chalk": "^4.0.0", + "deepmerge": "^4.2.2", + "glob": "^7.1.1", + "graceful-fs": "^4.2.4", + "jest-environment-jsdom": "^26.6.2", + "jest-environment-node": "^26.6.2", + "jest-get-type": "^26.3.0", + "jest-jasmine2": "^26.6.3", + "jest-regex-util": "^26.0.0", + "jest-resolve": "^26.6.2", + "jest-util": "^26.6.2", + "jest-validate": "^26.6.2", + "micromatch": "^4.0.2", + "pretty-format": "^26.6.2" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, + "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==", + "requires": { + "chalk": "^4.0.0", + "diff-sequences": "^26.6.2", + "jest-get-type": "^26.3.0", + "pretty-format": "^26.6.2" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, + "jest-docblock": { + "version": "26.0.0", + "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-26.0.0.tgz", + "integrity": "sha512-RDZ4Iz3QbtRWycd8bUEPxQsTlYazfYn/h5R65Fc6gOfwozFhoImx+affzky/FFBuqISPTqjXomoIGJVKBWoo0w==", + "requires": { + "detect-newline": "^3.0.0" + } + }, + "jest-each": { + "version": "26.6.2", + "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-26.6.2.tgz", + "integrity": "sha512-Mer/f0KaATbjl8MCJ+0GEpNdqmnVmDYqCTJYTvoo7rqmRiDllmp2AYN+06F93nXcY3ur9ShIjS+CO/uD+BbH4A==", + "requires": { + "@jest/types": "^26.6.2", + "chalk": "^4.0.0", + "jest-get-type": "^26.3.0", + "jest-util": "^26.6.2", + "pretty-format": "^26.6.2" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, + "jest-environment-jsdom": { + "version": "26.6.2", + "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-26.6.2.tgz", + "integrity": "sha512-jgPqCruTlt3Kwqg5/WVFyHIOJHsiAvhcp2qiR2QQstuG9yWox5+iHpU3ZrcBxW14T4fe5Z68jAfLRh7joCSP2Q==", + "requires": { + "@jest/environment": "^26.6.2", + "@jest/fake-timers": "^26.6.2", + "@jest/types": "^26.6.2", + "@types/node": "*", + "jest-mock": "^26.6.2", + "jest-util": "^26.6.2", + "jsdom": "^16.4.0" + } + }, + "jest-environment-node": { + "version": "26.6.2", + "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-26.6.2.tgz", + "integrity": "sha512-zhtMio3Exty18dy8ee8eJ9kjnRyZC1N4C1Nt/VShN1apyXc8rWGtJ9lI7vqiWcyyXS4BVSEn9lxAM2D+07/Tag==", + "requires": { + "@jest/environment": "^26.6.2", + "@jest/fake-timers": "^26.6.2", + "@jest/types": "^26.6.2", + "@types/node": "*", + "jest-mock": "^26.6.2", + "jest-util": "^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==" + }, + "jest-haste-map": { + "version": "26.6.2", + "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-26.6.2.tgz", + "integrity": "sha512-easWIJXIw71B2RdR8kgqpjQrbMRWQBgiBwXYEhtGUTaX+doCjBheluShdDMeR8IMfJiTqH4+zfhtg29apJf/8w==", + "requires": { + "@jest/types": "^26.6.2", + "@types/graceful-fs": "^4.1.2", + "@types/node": "*", + "anymatch": "^3.0.3", + "fb-watchman": "^2.0.0", + "fsevents": "^2.1.2", + "graceful-fs": "^4.2.4", + "jest-regex-util": "^26.0.0", + "jest-serializer": "^26.6.2", + "jest-util": "^26.6.2", + "jest-worker": "^26.6.2", + "micromatch": "^4.0.2", + "sane": "^4.0.3", + "walker": "^1.0.7" + } + }, + "jest-jasmine2": { + "version": "26.6.3", + "resolved": "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-26.6.3.tgz", + "integrity": "sha512-kPKUrQtc8aYwBV7CqBg5pu+tmYXlvFlSFYn18ev4gPFtrRzB15N2gW/Roew3187q2w2eHuu0MU9TJz6w0/nPEg==", + "requires": { + "@babel/traverse": "^7.1.0", + "@jest/environment": "^26.6.2", + "@jest/source-map": "^26.6.2", + "@jest/test-result": "^26.6.2", + "@jest/types": "^26.6.2", + "@types/node": "*", + "chalk": "^4.0.0", + "co": "^4.6.0", + "expect": "^26.6.2", + "is-generator-fn": "^2.0.0", + "jest-each": "^26.6.2", + "jest-matcher-utils": "^26.6.2", + "jest-message-util": "^26.6.2", + "jest-runtime": "^26.6.3", + "jest-snapshot": "^26.6.2", + "jest-util": "^26.6.2", + "pretty-format": "^26.6.2", + "throat": "^5.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, + "jest-leak-detector": { + "version": "26.6.2", + "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-26.6.2.tgz", + "integrity": "sha512-i4xlXpsVSMeKvg2cEKdfhh0H39qlJlP5Ex1yQxwF9ubahboQYMgTtz5oML35AVA3B4Eu+YsmwaiKVev9KCvLxg==", + "requires": { + "jest-get-type": "^26.3.0", + "pretty-format": "^26.6.2" + } + }, + "jest-matcher-utils": { + "version": "26.6.2", + "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-26.6.2.tgz", + "integrity": "sha512-llnc8vQgYcNqDrqRDXWwMr9i7rS5XFiCwvh6DTP7Jqa2mqpcCBBlpCbn+trkG0KNhPu/h8rzyBkriOtBstvWhw==", + "requires": { + "chalk": "^4.0.0", + "jest-diff": "^26.6.2", + "jest-get-type": "^26.3.0", + "pretty-format": "^26.6.2" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, + "jest-message-util": { + "version": "26.6.2", + "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-26.6.2.tgz", + "integrity": "sha512-rGiLePzQ3AzwUshu2+Rn+UMFk0pHN58sOG+IaJbk5Jxuqo3NYO1U2/MIR4S1sKgsoYSXSzdtSa0TgrmtUwEbmA==", + "requires": { + "@babel/code-frame": "^7.0.0", + "@jest/types": "^26.6.2", + "@types/stack-utils": "^2.0.0", + "chalk": "^4.0.0", + "graceful-fs": "^4.2.4", + "micromatch": "^4.0.2", + "pretty-format": "^26.6.2", + "slash": "^3.0.0", + "stack-utils": "^2.0.2" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, + "jest-mock": { + "version": "26.6.2", + "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-26.6.2.tgz", + "integrity": "sha512-YyFjePHHp1LzpzYcmgqkJ0nm0gg/lJx2aZFzFy1S6eUqNjXsOqTK10zNRff2dNfssgokjkG65OlWNcIlgd3zew==", + "requires": { + "@jest/types": "^26.6.2", + "@types/node": "*" + } + }, + "jest-pnp-resolver": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz", + "integrity": "sha512-olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w==" + }, + "jest-regex-util": { + "version": "26.0.0", + "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-26.0.0.tgz", + "integrity": "sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A==" + }, + "jest-resolve": { + "version": "26.6.2", + "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-26.6.2.tgz", + "integrity": "sha512-sOxsZOq25mT1wRsfHcbtkInS+Ek7Q8jCHUB0ZUTP0tc/c41QHriU/NunqMfCUWsL4H3MHpvQD4QR9kSYhS7UvQ==", + "requires": { + "@jest/types": "^26.6.2", + "chalk": "^4.0.0", + "graceful-fs": "^4.2.4", + "jest-pnp-resolver": "^1.2.2", + "jest-util": "^26.6.2", + "read-pkg-up": "^7.0.1", + "resolve": "^1.18.1", + "slash": "^3.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, + "jest-resolve-dependencies": { + "version": "26.6.3", + "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-26.6.3.tgz", + "integrity": "sha512-pVwUjJkxbhe4RY8QEWzN3vns2kqyuldKpxlxJlzEYfKSvY6/bMvxoFrYYzUO1Gx28yKWN37qyV7rIoIp2h8fTg==", + "requires": { + "@jest/types": "^26.6.2", + "jest-regex-util": "^26.0.0", + "jest-snapshot": "^26.6.2" + } + }, + "jest-runner": { + "version": "26.6.3", + "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-26.6.3.tgz", + "integrity": "sha512-atgKpRHnaA2OvByG/HpGA4g6CSPS/1LK0jK3gATJAoptC1ojltpmVlYC3TYgdmGp+GLuhzpH30Gvs36szSL2JQ==", + "requires": { + "@jest/console": "^26.6.2", + "@jest/environment": "^26.6.2", + "@jest/test-result": "^26.6.2", + "@jest/types": "^26.6.2", + "@types/node": "*", + "chalk": "^4.0.0", + "emittery": "^0.7.1", + "exit": "^0.1.2", + "graceful-fs": "^4.2.4", + "jest-config": "^26.6.3", + "jest-docblock": "^26.0.0", + "jest-haste-map": "^26.6.2", + "jest-leak-detector": "^26.6.2", + "jest-message-util": "^26.6.2", + "jest-resolve": "^26.6.2", + "jest-runtime": "^26.6.3", + "jest-util": "^26.6.2", + "jest-worker": "^26.6.2", + "source-map-support": "^0.5.6", + "throat": "^5.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, + "jest-runtime": { + "version": "26.6.3", + "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-26.6.3.tgz", + "integrity": "sha512-lrzyR3N8sacTAMeonbqpnSka1dHNux2uk0qqDXVkMv2c/A3wYnvQ4EXuI013Y6+gSKSCxdaczvf4HF0mVXHRdw==", + "requires": { + "@jest/console": "^26.6.2", + "@jest/environment": "^26.6.2", + "@jest/fake-timers": "^26.6.2", + "@jest/globals": "^26.6.2", + "@jest/source-map": "^26.6.2", + "@jest/test-result": "^26.6.2", + "@jest/transform": "^26.6.2", + "@jest/types": "^26.6.2", + "@types/yargs": "^15.0.0", + "chalk": "^4.0.0", + "cjs-module-lexer": "^0.6.0", + "collect-v8-coverage": "^1.0.0", + "exit": "^0.1.2", + "glob": "^7.1.3", + "graceful-fs": "^4.2.4", + "jest-config": "^26.6.3", + "jest-haste-map": "^26.6.2", + "jest-message-util": "^26.6.2", + "jest-mock": "^26.6.2", + "jest-regex-util": "^26.0.0", + "jest-resolve": "^26.6.2", + "jest-snapshot": "^26.6.2", + "jest-util": "^26.6.2", + "jest-validate": "^26.6.2", + "slash": "^3.0.0", + "strip-bom": "^4.0.0", + "yargs": "^15.4.1" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, + "jest-serializer": { + "version": "26.6.2", + "resolved": "https://registry.npmjs.org/jest-serializer/-/jest-serializer-26.6.2.tgz", + "integrity": "sha512-S5wqyz0DXnNJPd/xfIzZ5Xnp1HrJWBczg8mMfMpN78OJ5eDxXyf+Ygld9wX1DnUWbIbhM1YDY95NjR4CBXkb2g==", + "requires": { + "@types/node": "*", + "graceful-fs": "^4.2.4" + } + }, + "jest-snapshot": { + "version": "26.6.2", + "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-26.6.2.tgz", + "integrity": "sha512-OLhxz05EzUtsAmOMzuupt1lHYXCNib0ECyuZ/PZOx9TrZcC8vL0x+DUG3TL+GLX3yHG45e6YGjIm0XwDc3q3og==", + "requires": { + "@babel/types": "^7.0.0", + "@jest/types": "^26.6.2", + "@types/babel__traverse": "^7.0.4", + "@types/prettier": "^2.0.0", + "chalk": "^4.0.0", + "expect": "^26.6.2", + "graceful-fs": "^4.2.4", + "jest-diff": "^26.6.2", + "jest-get-type": "^26.3.0", + "jest-haste-map": "^26.6.2", + "jest-matcher-utils": "^26.6.2", + "jest-message-util": "^26.6.2", + "jest-resolve": "^26.6.2", + "natural-compare": "^1.4.0", + "pretty-format": "^26.6.2", + "semver": "^7.3.2" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" + }, + "semver": { + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", + "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==" + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, + "jest-util": { + "version": "26.6.2", + "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-26.6.2.tgz", + "integrity": "sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q==", + "requires": { + "@jest/types": "^26.6.2", + "@types/node": "*", + "chalk": "^4.0.0", + "graceful-fs": "^4.2.4", + "is-ci": "^2.0.0", + "micromatch": "^4.0.2" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, + "jest-validate": { + "version": "26.6.2", + "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-26.6.2.tgz", + "integrity": "sha512-NEYZ9Aeyj0i5rQqbq+tpIOom0YS1u2MVu6+euBsvpgIme+FOfRmoC4R5p0JiAUpaFvFy24xgrpMknarR/93XjQ==", + "requires": { + "@jest/types": "^26.6.2", + "camelcase": "^6.0.0", + "chalk": "^4.0.0", + "jest-get-type": "^26.3.0", + "leven": "^3.1.0", + "pretty-format": "^26.6.2" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "requires": { + "color-convert": "^2.0.1" + } + }, + "camelcase": { + "version": "6.2.0", + "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz", + "integrity": "sha512-c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg==" + }, + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, + "jest-watcher": { + "version": "26.6.2", + "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-26.6.2.tgz", + "integrity": "sha512-WKJob0P/Em2csiVthsI68p6aGKTIcsfjH9Gsx1f0A3Italz43e3ho0geSAVsmj09RWOELP1AZ/DXyJgOgDKxXQ==", + "requires": { + "@jest/test-result": "^26.6.2", + "@jest/types": "^26.6.2", + "@types/node": "*", + "ansi-escapes": "^4.2.1", + "chalk": "^4.0.0", + "jest-util": "^26.6.2", + "string-length": "^4.0.1" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, + "jest-worker": { + "version": "26.6.2", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz", + "integrity": "sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==", + "requires": { + "@types/node": "*", + "merge-stream": "^2.0.0", + "supports-color": "^7.0.0" + }, + "dependencies": { + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, "joi": { "version": "17.2.1", "resolved": "https://registry.npmjs.org/joi/-/joi-17.2.1.tgz", @@ -1465,17 +4568,86 @@ "integrity": "sha512-PWsmefG6Jkodqt+ePTvBZCSMFgN7Clckjd0O7su3I0+BW2QWUTJNzjktHsztGLhncP2h8mcF9V9Y2Ha59pAViQ==", "dev": true }, + "js-tokens": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==" + }, + "js-yaml": { + "version": "3.14.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.0.tgz", + "integrity": "sha512-/4IbIeHcD9VMHFqDR/gQ7EdZdLimOvW2DdcxFjdyyZ9NsbS+ccrXqVWDtab/lRl5AlUqmpBx8EhPaWR+OtY17A==", + "requires": { + "argparse": "^1.0.7", + "esprima": "^4.0.0" + } + }, "jsbn": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=" }, + "jsdom": { + "version": "16.4.0", + "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-16.4.0.tgz", + "integrity": "sha512-lYMm3wYdgPhrl7pDcRmvzPhhrGVBeVhPIqeHjzeiHN3DFmD1RBpbExbi8vU7BJdH8VAZYovR8DMt0PNNDM7k8w==", + "requires": { + "abab": "^2.0.3", + "acorn": "^7.1.1", + "acorn-globals": "^6.0.0", + "cssom": "^0.4.4", + "cssstyle": "^2.2.0", + "data-urls": "^2.0.0", + "decimal.js": "^10.2.0", + "domexception": "^2.0.1", + "escodegen": "^1.14.1", + "html-encoding-sniffer": "^2.0.1", + "is-potential-custom-element-name": "^1.0.0", + "nwsapi": "^2.2.0", + "parse5": "5.1.1", + "request": "^2.88.2", + "request-promise-native": "^1.0.8", + "saxes": "^5.0.0", + "symbol-tree": "^3.2.4", + "tough-cookie": "^3.0.1", + "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": "^8.0.0", + "ws": "^7.2.3", + "xml-name-validator": "^3.0.0" + }, + "dependencies": { + "tough-cookie": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-3.0.1.tgz", + "integrity": "sha512-yQyJ0u4pZsv9D4clxO69OEjLWYw+jbgspjTue4lTQZLfV0c5l1VmK2y1JK8E9ahdpltPOaAThPcp5nKPUgSnsg==", + "requires": { + "ip-regex": "^2.1.0", + "psl": "^1.1.28", + "punycode": "^2.1.1" + } + } + } + }, + "jsesc": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", + "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==" + }, "json-buffer": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz", "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=", "dev": true }, + "json-parse-even-better-errors": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", + "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==" + }, "json-schema": { "version": "0.2.3", "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", @@ -1486,6 +4658,14 @@ "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", "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==", + "requires": { + "minimist": "^1.2.5" + } + }, "jsonwebtoken": { "version": "8.5.1", "resolved": "https://registry.npmjs.org/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz", @@ -1554,6 +4734,16 @@ "json-buffer": "3.0.0" } }, + "kind-of": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==" + }, + "kleur": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz", + "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==" + }, "latest": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/latest/-/latest-0.2.0.tgz", @@ -1571,17 +4761,43 @@ "package-json": "^6.3.0" } }, + "leven": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz", + "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==" + }, + "levn": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", + "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", + "requires": { + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2" + } + }, + "lines-and-columns": { + "version": "1.1.6", + "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.1.6.tgz", + "integrity": "sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=" + }, "liquid-json": { "version": "0.3.1", "resolved": "https://registry.npmjs.org/liquid-json/-/liquid-json-0.3.1.tgz", "integrity": "sha1-kVWhgTbYprJhXl8W+aJEira1Duo=", "dev": true }, + "locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "requires": { + "p-locate": "^4.1.0" + } + }, "lodash": { "version": "4.17.20", "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.20.tgz", - "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==", - "dev": true + "integrity": "sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==" }, "lodash.clonedeep": { "version": "4.5.0", @@ -1651,6 +4867,11 @@ "resolved": "https://registry.npmjs.org/lodash.set/-/lodash.set-4.3.2.tgz", "integrity": "sha1-2HV7HagH3eJIFrDWqEvqGnYjCyM=" }, + "lodash.sortby": { + "version": "4.7.0", + "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz", + "integrity": "sha1-7dFMgk4sycHgsKG0K7UhBRakJDg=" + }, "lowercase-keys": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz", @@ -1661,7 +4882,6 @@ "version": "3.1.0", "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", - "dev": true, "requires": { "semver": "^6.0.0" }, @@ -1669,11 +4889,31 @@ "semver": { "version": "6.3.0", "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.0.tgz", - "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==", - "dev": true + "integrity": "sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw==" } } }, + "makeerror": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.11.tgz", + "integrity": "sha1-4BpckQnyr3lmDk6LlYd5AYT1qWw=", + "requires": { + "tmpl": "1.0.x" + } + }, + "map-cache": { + "version": "0.2.2", + "resolved": "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz", + "integrity": "sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=" + }, + "map-visit": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz", + "integrity": "sha1-7Nyo8TFE5mDxtb1B8S80edmN+48=", + "requires": { + "object-visit": "^1.0.0" + } + }, "marked": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/marked/-/marked-1.1.1.tgz", @@ -1696,6 +4936,11 @@ "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz", "integrity": "sha1-sAqqVW3YtEVoFQ7J0blT8/kMu2E=" }, + "merge-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", + "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==" + }, "method-override": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/method-override/-/method-override-3.0.0.tgz", @@ -1722,6 +4967,15 @@ "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=" }, + "micromatch": { + "version": "4.0.2", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.2.tgz", + "integrity": "sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==", + "requires": { + "braces": "^3.0.1", + "picomatch": "^2.0.5" + } + }, "mime": { "version": "1.6.0", "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", @@ -1749,6 +5003,11 @@ "mime-db": "1.43.0" } }, + "mimic-fn": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz", + "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==" + }, "mimic-response": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz", @@ -1766,8 +5025,26 @@ "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==" + }, + "mixin-deep": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/mixin-deep/-/mixin-deep-1.3.2.tgz", + "integrity": "sha512-WRoDn//mXBiJ1H40rqa3vH0toePwSsGb45iInWlTySa+Uu4k3tYUSxa2v1KqAiLtvlrSzaExqS1gtk96A9zvEA==", + "requires": { + "for-in": "^1.0.2", + "is-extendable": "^1.0.1" + }, + "dependencies": { + "is-extendable": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/is-extendable/-/is-extendable-1.0.1.tgz", + "integrity": "sha512-arnXMxT1hhoKo9k1LZdmlNyJdDDfy2v0fXjFlmok4+i8ul/6WlbVge9bhM74OpNPQPMGUToDtz+KXa1PneJxOA==", + "requires": { + "is-plain-object": "^2.0.4" + } + } + } }, "mkdirp": { "version": "1.0.4", @@ -1888,6 +5165,29 @@ "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g=" }, + "nanomatch": { + "version": "1.2.13", + "resolved": "https://registry.npmjs.org/nanomatch/-/nanomatch-1.2.13.tgz", + "integrity": "sha512-fpoe2T0RbHwBTBUOftAfBPaDEi06ufaUai0mE6Yn1kacc3SnTErfb/h+X94VXzI64rKFHYImXSvdwGGCmwOqCA==", + "requires": { + "arr-diff": "^4.0.0", + "array-unique": "^0.3.2", + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "fragment-cache": "^0.2.1", + "is-windows": "^1.0.2", + "kind-of": "^6.0.2", + "object.pick": "^1.3.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.1" + } + }, + "natural-compare": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", + "integrity": "sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=" + }, "negotiator": { "version": "0.6.2", "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz", @@ -1953,6 +5253,58 @@ } } }, + "nice-try": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", + "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==" + }, + "node-int64": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz", + "integrity": "sha1-h6kGXNs1XTGC2PlM4RGIuCXGijs=" + }, + "node-modules-regexp": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz", + "integrity": "sha1-jZ2+KJZKSsVxLpExZCEHxx6Q7EA=" + }, + "node-notifier": { + "version": "8.0.0", + "resolved": "https://registry.npmjs.org/node-notifier/-/node-notifier-8.0.0.tgz", + "integrity": "sha512-46z7DUmcjoYdaWyXouuFNNfUo6eFa94t23c53c+lG/9Cvauk4a98rAUp9672X5dxGdQmLpPzTxzu8f/OeEPaFA==", + "optional": true, + "requires": { + "growly": "^1.3.0", + "is-wsl": "^2.2.0", + "semver": "^7.3.2", + "shellwords": "^0.1.1", + "uuid": "^8.3.0", + "which": "^2.0.2" + }, + "dependencies": { + "semver": { + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", + "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==", + "optional": true + }, + "uuid": { + "version": "8.3.1", + "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.1.tgz", + "integrity": "sha512-FOmRr+FmWEIG8uhZv6C2bTgEVXsHk08kE7mPlrBbEe+c3r9pjceVPgupIfNIhc4yx55H69OXANrUaSuu9eInKg==", + "optional": true + }, + "which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "optional": true, + "requires": { + "isexe": "^2.0.0" + } + } + } + }, "node-oauth1": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/node-oauth1/-/node-oauth1-1.3.0.tgz", @@ -2008,11 +5360,21 @@ "abbrev": "1" } }, + "normalize-package-data": { + "version": "2.5.0", + "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.5.0.tgz", + "integrity": "sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==", + "requires": { + "hosted-git-info": "^2.1.4", + "resolve": "^1.10.0", + "semver": "2 || 3 || 4 || 5", + "validate-npm-package-license": "^3.0.1" + } + }, "normalize-path": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", - "dev": true + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==" }, "normalize-url": { "version": "4.5.0", @@ -3428,12 +6790,25 @@ } } }, + "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=", + "requires": { + "path-key": "^2.0.0" + } + }, "number-is-nan": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz", "integrity": "sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=", "dev": true }, + "nwsapi": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz", + "integrity": "sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==" + }, "oauth-sign": { "version": "0.9.0", "resolved": "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz", @@ -3444,12 +6819,56 @@ "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", "integrity": "sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=" }, + "object-copy": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz", + "integrity": "sha1-fn2Fi3gb18mRpBupde04EnVOmYw=", + "requires": { + "copy-descriptor": "^0.1.0", + "define-property": "^0.2.5", + "kind-of": "^3.0.3" + }, + "dependencies": { + "define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "requires": { + "is-descriptor": "^0.1.0" + } + }, + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "requires": { + "is-buffer": "^1.1.5" + } + } + } + }, "object-hash": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-1.3.1.tgz", "integrity": "sha512-OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA==", "dev": true }, + "object-visit": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz", + "integrity": "sha1-95xEk68MU3e1n+OdOV5BBC3QRbs=", + "requires": { + "isobject": "^3.0.0" + } + }, + "object.pick": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz", + "integrity": "sha1-h6EKxMFpS9Lhy/U1kaZhQftd10c=", + "requires": { + "isobject": "^3.0.1" + } + }, "on-finished": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", @@ -3467,17 +6886,68 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", - "dev": true, "requires": { "wrappy": "1" } }, + "onetime": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz", + "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==", + "requires": { + "mimic-fn": "^2.1.0" + } + }, + "optionator": { + "version": "0.8.3", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.3.tgz", + "integrity": "sha512-+IW9pACdk3XWmmTXG8m3upGUJst5XRGzxMRjXzAuJ1XnIFNvfhjjIuYkDvysnPQ7qzqVzLt78BCruntqRhWQbA==", + "requires": { + "deep-is": "~0.1.3", + "fast-levenshtein": "~2.0.6", + "levn": "~0.3.0", + "prelude-ls": "~1.1.2", + "type-check": "~0.3.2", + "word-wrap": "~1.2.3" + } + }, "p-cancelable": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz", "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==", "dev": true }, + "p-each-series": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/p-each-series/-/p-each-series-2.1.0.tgz", + "integrity": "sha512-ZuRs1miPT4HrjFa+9fRfOFXxGJfORgelKV9f9nNOWw2gl6gVsRaVDOQP0+MI0G0wGKns1Yacsu0GjOFbTK0JFQ==" + }, + "p-finally": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz", + "integrity": "sha1-P7z7FbiZpEEjs0ttzBi3JDNqLK4=" + }, + "p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "requires": { + "p-try": "^2.0.0" + } + }, + "p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "requires": { + "p-limit": "^2.2.0" + } + }, + "p-try": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==" + }, "package-json": { "version": "6.5.0", "resolved": "https://registry.npmjs.org/package-json/-/package-json-6.5.0.tgz", @@ -3498,17 +6968,38 @@ } } }, + "parse-json": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.1.0.tgz", + "integrity": "sha512-+mi/lmVVNKFNVyLXV31ERiy2CY5E1/F6QtJFEzoChPRwwngMNXRDQ9GJ5WdE2Z2P4AujsOi0/+2qHID68KwfIQ==", + "requires": { + "@babel/code-frame": "^7.0.0", + "error-ex": "^1.3.1", + "json-parse-even-better-errors": "^2.3.0", + "lines-and-columns": "^1.1.6" + } + }, "parse-ms": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-2.1.0.tgz", "integrity": "sha512-kHt7kzLoS9VBZfUsiKjv43mr91ea+U05EyKkEtqp7vNbHxmaVuEqN7XxeEVnGrMtYOAxGrDElSi96K7EgO1zCA==", "dev": true }, + "parse5": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/parse5/-/parse5-5.1.1.tgz", + "integrity": "sha512-ugq4DFI0Ptb+WWjAdOK16+u/nHfiIrcE+sh8kZMaM0WllQKLI9rOUq6c2b7cwPkXdzfQESqvoqK6ug7U/Yyzug==" + }, "parseurl": { "version": "1.3.3", "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==" }, + "pascalcase": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz", + "integrity": "sha1-s2PlXoAGym/iF4TS2yK9FdeRfxQ=" + }, "passport": { "version": "0.4.1", "resolved": "https://registry.npmjs.org/passport/-/passport-0.4.1.tgz", @@ -3531,6 +7022,26 @@ "resolved": "https://registry.npmjs.org/passport-strategy/-/passport-strategy-1.0.0.tgz", "integrity": "sha1-tVOaqPwiWj0a0XlHbd8ja0QPUuQ=" }, + "path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==" + }, + "path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha1-F0uSaHNVNP+8es5r9TpanhtcX18=" + }, + "path-key": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz", + "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=" + }, + "path-parse": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.6.tgz", + "integrity": "sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==" + }, "path-to-regexp": { "version": "0.1.7", "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", @@ -3549,8 +7060,28 @@ "picomatch": { "version": "2.2.2", "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz", - "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==", - "dev": true + "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==" + }, + "pirates": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.1.tgz", + "integrity": "sha512-WuNqLTbMI3tmfef2TKxlQmAiLHKtFhlsCZnPIpuv2Ow0RDVO8lfy1Opf4NUzlMXLjPl+Men7AuVdX6TA+s+uGA==", + "requires": { + "node-modules-regexp": "^1.0.0" + } + }, + "pkg-dir": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", + "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", + "requires": { + "find-up": "^4.0.0" + } + }, + "posix-character-classes": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz", + "integrity": "sha1-AerA/jta9xoqbAL+q7jB/vfgDqs=" }, "postcss": { "version": "7.0.35", @@ -3827,12 +7358,51 @@ "punycode": "^2.1.1" } }, + "prelude-ls": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", + "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=" + }, "prepend-http": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz", "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=", "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==", + "requires": { + "@jest/types": "^26.6.2", + "ansi-regex": "^5.0.0", + "ansi-styles": "^4.0.0", + "react-is": "^17.0.1" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "requires": { + "color-convert": "^2.0.1" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + } + } + }, "pretty-ms": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-7.0.0.tgz", @@ -3847,6 +7417,15 @@ "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" }, + "prompts": { + "version": "2.4.0", + "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.0.tgz", + "integrity": "sha512-awZAKrk3vN6CroQukBL+R9051a4R3zCZBlJm/HBfrSZ8iTpYix3VX1vU4mveiLpiwmOJT4wokTF9m6HUk4KqWQ==", + "requires": { + "kleur": "^3.0.3", + "sisteransi": "^1.0.5" + } + }, "proxy-addr": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.6.tgz", @@ -3871,7 +7450,6 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz", "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==", - "dev": true, "requires": { "end-of-stream": "^1.1.0", "once": "^1.3.1" @@ -3880,8 +7458,7 @@ "punycode": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.1.1.tgz", - "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", - "dev": true + "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==" }, "pupa": { "version": "2.0.1", @@ -3938,6 +7515,39 @@ } } }, + "react-is": { + "version": "17.0.1", + "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.1.tgz", + "integrity": "sha512-NAnt2iGDXohE5LI7uBnLnqvLQMtzhkiAOLXTmv+qnF9Ky7xAPcX8Up/xWIhxvLVGJvuLiNc4xQLtuqDRzb4fSA==" + }, + "read-pkg": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-5.2.0.tgz", + "integrity": "sha512-Ug69mNOpfvKDAc2Q8DRpMjjzdtrnv9HcSMX+4VsZxD1aZ6ZzrIE7rlzXBtWTyhULSMKg076AW6WR5iZpD0JiOg==", + "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==" + } + } + }, + "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==", + "requires": { + "find-up": "^4.1.0", + "read-pkg": "^5.2.0", + "type-fest": "^0.8.1" + } + }, "readable-stream": { "version": "2.3.7", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", @@ -3961,6 +7571,15 @@ "picomatch": "^2.2.1" } }, + "regex-not": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/regex-not/-/regex-not-1.0.2.tgz", + "integrity": "sha512-J6SDjUgDxQj5NusnOtdFxDwN/+HWykR8GELwctJ7mdqhcyy1xEc4SRFHUXvxTp661YaVKAjfRLZ9cCqS6tn32A==", + "requires": { + "extend-shallow": "^3.0.2", + "safe-regex": "^1.1.0" + } + }, "regexp-clone": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/regexp-clone/-/regexp-clone-1.0.0.tgz", @@ -3984,6 +7603,21 @@ "rc": "^1.2.8" } }, + "remove-trailing-separator": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz", + "integrity": "sha1-wkvOKig62tW8P1jg1IJJuSN52O8=" + }, + "repeat-element": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/repeat-element/-/repeat-element-1.1.3.tgz", + "integrity": "sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==" + }, + "repeat-string": { + "version": "1.6.1", + "resolved": "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz", + "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=" + }, "request": { "version": "2.88.2", "resolved": "https://registry.npmjs.org/request/-/request-2.88.2.tgz", @@ -4018,6 +7652,34 @@ } } }, + "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==", + "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==", + "requires": { + "request-promise-core": "1.1.4", + "stealthy-require": "^1.1.1", + "tough-cookie": "^2.3.3" + } + }, + "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_optional": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/require_optional/-/require_optional-1.0.1.tgz", @@ -4027,11 +7689,40 @@ "semver": "^5.1.0" } }, + "resolve": { + "version": "1.19.0", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.19.0.tgz", + "integrity": "sha512-rArEXAgsBG4UgRGcynxWIWKFvh/XZCcS8UJdHhwy91zwAvCZIbcs+vAbflgBnNjYMs/i/i+/Ux6IZhML1yPvxg==", + "requires": { + "is-core-module": "^2.1.0", + "path-parse": "^1.0.6" + } + }, + "resolve-cwd": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz", + "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==", + "requires": { + "resolve-from": "^5.0.0" + }, + "dependencies": { + "resolve-from": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", + "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==" + } + } + }, "resolve-from": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz", "integrity": "sha1-lICrIOlP+h2egKgEx+oUdhGWa1c=" }, + "resolve-url": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz", + "integrity": "sha1-LGN/53yJOv0qZj/iGqkIAGjiBSo=" + }, "responselike": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz", @@ -4041,16 +7732,172 @@ "lowercase-keys": "^1.0.0" } }, + "ret": { + "version": "0.1.15", + "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz", + "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==" + }, + "rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "requires": { + "glob": "^7.1.3" + } + }, + "rsvp": { + "version": "4.8.5", + "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz", + "integrity": "sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==" + }, "safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==" }, + "safe-regex": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz", + "integrity": "sha1-QKNmnzsHfR6UPURinhV91IAjvy4=", + "requires": { + "ret": "~0.1.10" + } + }, "safer-buffer": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==" }, + "sane": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/sane/-/sane-4.1.0.tgz", + "integrity": "sha512-hhbzAgTIX8O7SHfp2c8/kREfEn4qO/9q8C9beyY6+tvZ87EpoZ3i1RIEvp27YBswnNbY9mWd6paKVmKbAgLfZA==", + "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==", + "requires": { + "micromatch": "^3.1.4", + "normalize-path": "^2.1.1" + } + }, + "braces": { + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", + "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", + "requires": { + "arr-flatten": "^1.1.0", + "array-unique": "^0.3.2", + "extend-shallow": "^2.0.1", + "fill-range": "^4.0.0", + "isobject": "^3.0.1", + "repeat-element": "^1.1.2", + "snapdragon": "^0.8.1", + "snapdragon-node": "^2.0.1", + "split-string": "^3.0.2", + "to-regex": "^3.0.1" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "requires": { + "is-extendable": "^0.1.0" + } + } + } + }, + "fill-range": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", + "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", + "requires": { + "extend-shallow": "^2.0.1", + "is-number": "^3.0.0", + "repeat-string": "^1.6.1", + "to-regex-range": "^2.1.0" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "requires": { + "is-extendable": "^0.1.0" + } + } + } + }, + "is-number": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", + "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", + "requires": { + "kind-of": "^3.0.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "requires": { + "is-buffer": "^1.1.5" + } + } + } + }, + "micromatch": { + "version": "3.1.10", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", + "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", + "requires": { + "arr-diff": "^4.0.0", + "array-unique": "^0.3.2", + "braces": "^2.3.1", + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "extglob": "^2.0.4", + "fragment-cache": "^0.2.1", + "kind-of": "^6.0.2", + "nanomatch": "^1.2.9", + "object.pick": "^1.3.0", + "regex-not": "^1.0.0", + "snapdragon": "^0.8.1", + "to-regex": "^3.0.2" + } + }, + "normalize-path": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz", + "integrity": "sha1-GrKLVW4Zg2Oowab35vogE3/mrtk=", + "requires": { + "remove-trailing-separator": "^1.0.1" + } + }, + "to-regex-range": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", + "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", + "requires": { + "is-number": "^3.0.0", + "repeat-string": "^1.6.1" + } + } + } + }, "sanitize-html": { "version": "1.20.1", "resolved": "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.20.1.tgz", @@ -4078,6 +7925,14 @@ "sparse-bitfield": "^3.0.3" } }, + "saxes": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/saxes/-/saxes-5.0.1.tgz", + "integrity": "sha512-5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw==", + "requires": { + "xmlchars": "^2.2.0" + } + }, "semver": { "version": "5.7.1", "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz", @@ -4157,11 +8012,56 @@ "send": "0.17.1" } }, + "set-blocking": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", + "integrity": "sha1-BF+XgtARrppoA93TgrJDkrPYkPc=" + }, + "set-value": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/set-value/-/set-value-2.0.1.tgz", + "integrity": "sha512-JxHc1weCN68wRY0fhCoXpyK55m/XPHafOmK4UWD7m2CI14GMcFypt4w/0+NV5f/ZMby2F6S2wwA7fgynh9gWSw==", + "requires": { + "extend-shallow": "^2.0.1", + "is-extendable": "^0.1.1", + "is-plain-object": "^2.0.3", + "split-string": "^3.0.1" + }, + "dependencies": { + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "requires": { + "is-extendable": "^0.1.0" + } + } + } + }, "setprototypeof": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz", "integrity": "sha512-JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw==" }, + "shebang-command": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz", + "integrity": "sha1-RKrGW2lbAzmJaMOfNj/uXer98eo=", + "requires": { + "shebang-regex": "^1.0.0" + } + }, + "shebang-regex": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz", + "integrity": "sha1-2kL0l0DAtC2yypcoVxyxkMmO/qM=" + }, + "shellwords": { + "version": "0.1.1", + "resolved": "https://registry.npmjs.org/shellwords/-/shellwords-0.1.1.tgz", + "integrity": "sha512-vFwSUfQvqybiICwZY5+DAWIPLKsWO31Q91JSKl3UYv+K5c2QRPzn0qzec6QPu1Qc9eHYItiP3NdJqNVqetYAww==", + "optional": true + }, "sift": { "version": "7.0.1", "resolved": "https://registry.npmjs.org/sift/-/sift-7.0.1.tgz", @@ -4170,8 +8070,17 @@ "signal-exit": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz", - "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==", - "dev": true + "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==" + }, + "sisteransi": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz", + "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==" + }, + "slash": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", + "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==" }, "sliced": { "version": "1.0.1", @@ -4183,11 +8092,138 @@ "resolved": "https://registry.npmjs.org/slug/-/slug-3.3.5.tgz", "integrity": "sha512-d/9yTbJDtSIhJThaNRP/U5uxwCl0mWIlV42JmKSfvg8t7DiVt69G8rAWTc0FWhaQOier0fiNAWVs7ctvVhK1RA==" }, + "snapdragon": { + "version": "0.8.2", + "resolved": "https://registry.npmjs.org/snapdragon/-/snapdragon-0.8.2.tgz", + "integrity": "sha512-FtyOnWN/wCHTVXOMwvSv26d+ko5vWlIDD6zoUJ7LW8vh+ZBC8QdljveRP+crNrtBwioEUWy/4dMtbBjA4ioNlg==", + "requires": { + "base": "^0.11.1", + "debug": "^2.2.0", + "define-property": "^0.2.5", + "extend-shallow": "^2.0.1", + "map-cache": "^0.2.2", + "source-map": "^0.5.6", + "source-map-resolve": "^0.5.0", + "use": "^3.1.0" + }, + "dependencies": { + "define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "requires": { + "is-descriptor": "^0.1.0" + } + }, + "extend-shallow": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", + "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", + "requires": { + "is-extendable": "^0.1.0" + } + }, + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=" + } + } + }, + "snapdragon-node": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/snapdragon-node/-/snapdragon-node-2.1.1.tgz", + "integrity": "sha512-O27l4xaMYt/RSQ5TR3vpWCAB5Kb/czIcqUFOM/C4fYcLnbZUc1PkjTAMjof2pBWaSTwOUd6qUHcFGVGj7aIwnw==", + "requires": { + "define-property": "^1.0.0", + "isobject": "^3.0.0", + "snapdragon-util": "^3.0.1" + }, + "dependencies": { + "define-property": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz", + "integrity": "sha1-dp66rz9KY6rTr56NMEybvnm/sOY=", + "requires": { + "is-descriptor": "^1.0.0" + } + }, + "is-accessor-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-1.0.0.tgz", + "integrity": "sha512-m5hnHTkcVsPfqx3AKlyttIPb7J+XykHvJP2B9bZDjlhLIoEq4XoK64Vg7boZlVWYK6LUY94dYPEE7Lh0ZkZKcQ==", + "requires": { + "kind-of": "^6.0.0" + } + }, + "is-data-descriptor": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-1.0.0.tgz", + "integrity": "sha512-jbRXy1FmtAoCjQkVmIVYwuuqDFUbaOeDjmed1tOGPrsMhtJA4rD9tkgA0F1qJ3gRFRXcHYVkdeaP50Q5rE/jLQ==", + "requires": { + "kind-of": "^6.0.0" + } + }, + "is-descriptor": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-1.0.2.tgz", + "integrity": "sha512-2eis5WqQGV7peooDyLmNEPUrps9+SXX5c9pL3xEB+4e9HnGuDa7mB7kHxHw4CbqS9k1T2hOH3miL8n8WtiYVtg==", + "requires": { + "is-accessor-descriptor": "^1.0.0", + "is-data-descriptor": "^1.0.0", + "kind-of": "^6.0.2" + } + } + } + }, + "snapdragon-util": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/snapdragon-util/-/snapdragon-util-3.0.1.tgz", + "integrity": "sha512-mbKkMdQKsjX4BAL4bRYTj21edOf8cN7XHdYUJEe+Zn99hVEYcMvKPct1IqNe7+AZPirn8BCDOQBHQZknqmKlZQ==", + "requires": { + "kind-of": "^3.2.0" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "requires": { + "is-buffer": "^1.1.5" + } + } + } + }, "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 + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==" + }, + "source-map-resolve": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/source-map-resolve/-/source-map-resolve-0.5.3.tgz", + "integrity": "sha512-Htz+RnsXWk5+P2slx5Jh3Q66vhQj1Cllm0zvnaY98+NFx+Dv2CF/f5O/t8x+KaNdrdIAsruNzoh/KpialbqAnw==", + "requires": { + "atob": "^2.1.2", + "decode-uri-component": "^0.2.0", + "resolve-url": "^0.2.1", + "source-map-url": "^0.4.0", + "urix": "^0.1.0" + } + }, + "source-map-support": { + "version": "0.5.19", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.19.tgz", + "integrity": "sha512-Wonm7zOCIJzBGQdB+thsPar0kYuCIzYvxZwlBa87yi/Mdjv7Tip2cyVbLj5o0cFPN4EVkuTwb3GDDyUx2DGnGw==", + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + } + }, + "source-map-url": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/source-map-url/-/source-map-url-0.4.0.tgz", + "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=" }, "sparse-bitfield": { "version": "3.0.3", @@ -4198,6 +8234,47 @@ "memory-pager": "^1.0.2" } }, + "spdx-correct": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.1.tgz", + "integrity": "sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==", + "requires": { + "spdx-expression-parse": "^3.0.0", + "spdx-license-ids": "^3.0.0" + } + }, + "spdx-exceptions": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz", + "integrity": "sha512-/tTrYOC7PPI1nUAgx34hUpqXuyJG+DTHJTnIULG4rDygi4xu/tfgmq1e1cIRwRzwZgo4NLySi+ricLkZkw4i5A==" + }, + "spdx-expression-parse": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", + "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", + "requires": { + "spdx-exceptions": "^2.1.0", + "spdx-license-ids": "^3.0.0" + } + }, + "spdx-license-ids": { + "version": "3.0.6", + "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz", + "integrity": "sha512-+orQK83kyMva3WyPf59k1+Y525csj5JejicWut55zeTWANuN17qSiSLUXWtzHeNWORSvT7GLDJ/E/XiIWoXBTw==" + }, + "split-string": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz", + "integrity": "sha512-NzNVhJDYpwceVVii8/Hu6DKfD2G+NrQHlS/V/qgv763EYudVwEcMQNxd2lh+0VrUByXN/oJkl5grOhYWvQUYiw==", + "requires": { + "extend-shallow": "^3.0.0" + } + }, + "sprintf-js": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", + "integrity": "sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw=" + }, "srcset": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/srcset/-/srcset-1.0.0.tgz", @@ -4230,11 +8307,50 @@ "integrity": "sha1-VHxws0fo0ytOEI6hoqFZ5f3eGcA=", "dev": true }, + "stack-utils": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.3.tgz", + "integrity": "sha512-gL//fkxfWUsIlFL2Tl42Cl6+HFALEaB1FU76I/Fy+oZjRreP7OPMXFlGbxM7NQsI0ZpUfw76sHnv0WNYuTb7Iw==", + "requires": { + "escape-string-regexp": "^2.0.0" + }, + "dependencies": { + "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==" + } + } + }, + "static-extend": { + "version": "0.1.2", + "resolved": "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz", + "integrity": "sha1-YICcOcv/VTNyJv1eC1IPNB8ftcY=", + "requires": { + "define-property": "^0.2.5", + "object-copy": "^0.1.0" + }, + "dependencies": { + "define-property": { + "version": "0.2.5", + "resolved": "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz", + "integrity": "sha1-w1se+RjsPJkPmlvFe+BKrOxcgRY=", + "requires": { + "is-descriptor": "^0.1.0" + } + } + } + }, "statuses": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", "integrity": "sha1-Fhx9rBd2Wf2YEfQ3cfqZOBR4Yow=" }, + "stealthy-require": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz", + "integrity": "sha1-NbCYdbT/SfJqd35QmzCQoyJr8ks=" + }, "stream-length": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/stream-length/-/stream-length-1.0.2.tgz", @@ -4250,11 +8366,19 @@ "integrity": "sha1-s/D6QZKVICpaKJ9ta+n0kJphcZM=", "dev": true }, + "string-length": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.1.tgz", + "integrity": "sha512-PKyXUd0LK0ePjSOnWn34V2uD6acUWev9uy0Ft05k0E8xRW+SKcA0F7eMr7h5xlzfn+4O3N+55rduYyet3Jk+jw==", + "requires": { + "char-regex": "^1.0.2", + "strip-ansi": "^6.0.0" + } + }, "string-width": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.0.tgz", "integrity": "sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==", - "dev": true, "requires": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", @@ -4273,11 +8397,25 @@ "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" } }, + "strip-bom": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz", + "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==" + }, + "strip-eof": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz", + "integrity": "sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=" + }, + "strip-final-newline": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-2.0.0.tgz", + "integrity": "sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA==" + }, "strip-json-comments": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", @@ -4292,12 +8430,41 @@ "has-flag": "^3.0.0" } }, + "supports-hyperlinks": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/supports-hyperlinks/-/supports-hyperlinks-2.1.0.tgz", + "integrity": "sha512-zoE5/e+dnEijk6ASB6/qrK+oYdm2do1hjoLWrqUC/8WEIW1gbxFcKuBof7sW8ArN6e+AYvsE8HBGiVRWL/F5CA==", + "requires": { + "has-flag": "^4.0.0", + "supports-color": "^7.0.0" + }, + "dependencies": { + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==" + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, "symbol": { "version": "0.3.1", "resolved": "https://registry.npmjs.org/symbol/-/symbol-0.3.1.tgz", "integrity": "sha1-tvmpANSWpX8CQI8iGYwQndoGMEE=", "dev": true }, + "symbol-tree": { + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", + "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==" + }, "teleport-javascript": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/teleport-javascript/-/teleport-javascript-1.0.0.tgz", @@ -4310,17 +8477,79 @@ "integrity": "sha512-a6sumDlzyHVJWb8+YofY4TW112G6p2FCPEAFk+59gIYHv3XHRhm9ltVQ9kli4hNWeQBwSpe8cRN25x0ROunMOw==", "dev": true }, + "terminal-link": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/terminal-link/-/terminal-link-2.1.1.tgz", + "integrity": "sha512-un0FmiRUQNr5PJqy9kP7c40F5BOfpGlYTrxonDChEZB7pzZxRNp/bt+ymiy9/npwXya9KH99nJ/GXFIiUkYGFQ==", + "requires": { + "ansi-escapes": "^4.2.1", + "supports-hyperlinks": "^2.0.0" + } + }, + "test-exclude": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", + "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==", + "requires": { + "@istanbuljs/schema": "^0.1.2", + "glob": "^7.1.4", + "minimatch": "^3.0.4" + } + }, + "throat": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/throat/-/throat-5.0.0.tgz", + "integrity": "sha512-fcwX4mndzpLQKBS1DVYhGAcYaYt7vsHNIvQV+WXMvnow5cgjPphq5CaayLaGsjRdSCKZFNGt7/GYAuXaNOiYCA==" + }, + "tmpl": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/tmpl/-/tmpl-1.0.4.tgz", + "integrity": "sha1-I2QN17QtAEM5ERQIIOXPRA5SHdE=" + }, + "to-fast-properties": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", + "integrity": "sha1-3F5pjL0HkmW8c+A3doGk5Og/YW4=" + }, + "to-object-path": { + "version": "0.3.0", + "resolved": "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz", + "integrity": "sha1-KXWIt7Dn4KwI4E5nL4XB9JmeF68=", + "requires": { + "kind-of": "^3.0.2" + }, + "dependencies": { + "kind-of": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", + "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", + "requires": { + "is-buffer": "^1.1.5" + } + } + } + }, "to-readable-stream": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/to-readable-stream/-/to-readable-stream-1.0.0.tgz", "integrity": "sha512-Iq25XBt6zD5npPhlLVXGFN3/gyR2/qODcKNNyTMd4vbm39HUaOiAM4PMq0eMVC/Tkxz+Zjdsc55g9yyz+Yq00Q==", "dev": true }, + "to-regex": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/to-regex/-/to-regex-3.0.2.tgz", + "integrity": "sha512-FWtleNAtZ/Ki2qtqej2CXTOayOH9bHDQF+Q48VpWyDXjbYxA4Yz8iDB31zXOBUlOHHKidDbqGVrTUvQMPmBGBw==", + "requires": { + "define-property": "^2.0.2", + "extend-shallow": "^3.0.2", + "regex-not": "^1.0.2", + "safe-regex": "^1.1.0" + } + }, "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" } @@ -4355,6 +8584,14 @@ } } }, + "tr46": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/tr46/-/tr46-2.0.2.tgz", + "integrity": "sha512-3n1qG+/5kg+jrbTzwAykB5yRYtQCTqOGKq5U5PE3b0a1/mzo6snDhjGS0zJVJunO0NrT3Dg1MLy5TjWP/UJppg==", + "requires": { + "punycode": "^2.1.1" + } + }, "tunnel-agent": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", @@ -4368,11 +8605,23 @@ "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", "integrity": "sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=" }, + "type-check": { + "version": "0.3.2", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", + "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", + "requires": { + "prelude-ls": "~1.1.2" + } + }, + "type-detect": { + "version": "4.0.8", + "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", + "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==" + }, "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 + "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==" }, "type-is": { "version": "1.6.18", @@ -4387,7 +8636,6 @@ "version": "3.1.5", "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==", - "dev": true, "requires": { "is-typedarray": "^1.0.0" } @@ -4421,6 +8669,17 @@ "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.11.0.tgz", "integrity": "sha512-xY96SsN3NA461qIRKZ/+qox37YXPtSBswMGfiNptr+wrt6ds4HaMw23TP612fEyGekRE6LNRiLYr/aqbHXNedw==" }, + "union-value": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/union-value/-/union-value-1.0.1.tgz", + "integrity": "sha512-tJfXmxMeWYnczCVs7XAEvIV7ieppALdyepWMkHkwciRpZraG/xwT+s2JN8+pr1+8jCRf80FFzvr+MpQeeoF4Xg==", + "requires": { + "arr-union": "^3.1.0", + "get-value": "^2.0.6", + "is-extendable": "^0.1.1", + "set-value": "^2.0.1" + } + }, "unique-string": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-2.0.0.tgz", @@ -4435,6 +8694,42 @@ "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", "integrity": "sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=" }, + "unset-value": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz", + "integrity": "sha1-g3aHP30jNRef+x5vw6jtDfyKtVk=", + "requires": { + "has-value": "^0.3.1", + "isobject": "^3.0.0" + }, + "dependencies": { + "has-value": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz", + "integrity": "sha1-ex9YutpiyoJ+wKIHgCVlSEWZXh8=", + "requires": { + "get-value": "^2.0.3", + "has-values": "^0.1.4", + "isobject": "^2.0.0" + }, + "dependencies": { + "isobject": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", + "integrity": "sha1-8GVWEJaj8dou9GJy+BXIQNh+DIk=", + "requires": { + "isarray": "1.0.0" + } + } + } + }, + "has-values": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz", + "integrity": "sha1-bWHeldkd/Km5oCCJrThL/49it3E=" + } + } + }, "update-notifier": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-4.1.0.tgz", @@ -4523,6 +8818,11 @@ } } }, + "urix": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz", + "integrity": "sha1-2pN/emLiH+wf0Y1Js1wpNQZ6bHI=" + }, "url-parse-lax": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz", @@ -4532,6 +8832,11 @@ "prepend-http": "^2.0.0" } }, + "use": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/use/-/use-3.1.1.tgz", + "integrity": "sha512-cwESVXlO3url9YWlFW/TA9cshCEhtu7IKJ/p5soJ/gGpj7vbvFrAY/eIioQ6Dw23KjZhYgiIo8HOs1nQ2vr/oQ==" + }, "utcstring": { "version": "0.1.0", "resolved": "https://registry.npmjs.org/utcstring/-/utcstring-0.1.0.tgz", @@ -4585,6 +8890,32 @@ } } }, + "v8-to-istanbul": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-7.0.0.tgz", + "integrity": "sha512-fLL2rFuQpMtm9r8hrAV2apXX/WqHJ6+IC4/eQVdMDGBUgH/YMV4Gv3duk3kjmyg6uiQWBAA9nJwue4iJUOkHeA==", + "requires": { + "@types/istanbul-lib-coverage": "^2.0.1", + "convert-source-map": "^1.6.0", + "source-map": "^0.7.3" + }, + "dependencies": { + "source-map": { + "version": "0.7.3", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz", + "integrity": "sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ==" + } + } + }, + "validate-npm-package-license": { + "version": "3.0.4", + "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", + "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", + "requires": { + "spdx-correct": "^3.0.0", + "spdx-expression-parse": "^3.0.0" + } + }, "vary": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", @@ -4600,6 +8931,71 @@ "extsprintf": "^1.2.0" } }, + "w3c-hr-time": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/w3c-hr-time/-/w3c-hr-time-1.0.2.tgz", + "integrity": "sha512-z8P5DvDNjKDoFIHK7q8r8lackT6l+jo/Ye3HOle7l9nICP9lf1Ci25fy9vHd0JOWewkIFzXIEig3TdKT7JQ5fQ==", + "requires": { + "browser-process-hrtime": "^1.0.0" + } + }, + "w3c-xmlserializer": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz", + "integrity": "sha512-4tzD0mF8iSiMiNs30BiLO3EpfGLZUT2MSX/G+o7ZywDzliWQ3OPtTZ0PTC3B3ca1UAf4cJMHB+2Bf56EriJuRA==", + "requires": { + "xml-name-validator": "^3.0.0" + } + }, + "walker": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/walker/-/walker-1.0.7.tgz", + "integrity": "sha1-L3+bj9ENZ3JisYqITijRlhjgKPs=", + "requires": { + "makeerror": "1.0.x" + } + }, + "webidl-conversions": { + "version": "6.1.0", + "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-6.1.0.tgz", + "integrity": "sha512-qBIvFLGiBpLjfwmYAaHPXsn+ho5xZnGvyGvsarywGNc8VyQJUMHJ8OBKGGrPER0okBeMDaan4mNBlgBROxuI8w==" + }, + "whatwg-encoding": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-1.0.5.tgz", + "integrity": "sha512-b5lim54JOPN9HtzvK9HFXvBma/rnfFeqsic0hSpjtDbVxR3dJKLc+KB4V6GgiGOvl7CY/KNh8rxSo9DKQrnUEw==", + "requires": { + "iconv-lite": "0.4.24" + } + }, + "whatwg-mimetype": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz", + "integrity": "sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g==" + }, + "whatwg-url": { + "version": "8.4.0", + "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.4.0.tgz", + "integrity": "sha512-vwTUFf6V4zhcPkWp/4CQPr1TW9Ml6SF4lVyaIMBdJw5i6qUUJ1QWM4Z6YYVkfka0OUIzVo/0aNtGVGk256IKWw==", + "requires": { + "lodash.sortby": "^4.7.0", + "tr46": "^2.0.2", + "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==", + "requires": { + "isexe": "^2.0.0" + } + }, + "which-module": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz", + "integrity": "sha1-2e8H3Od7mQK4o6j6SzHD4/fm6Ho=" + }, "widest-line": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-3.1.0.tgz", @@ -4612,8 +9008,7 @@ "word-wrap": { "version": "1.2.3", "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz", - "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==", - "dev": true + "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==" }, "wordwrap": { "version": "1.0.0", @@ -4621,17 +9016,48 @@ "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=", "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==", + "requires": { + "ansi-styles": "^4.0.0", + "string-width": "^4.1.0", + "strip-ansi": "^6.0.0" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "requires": { + "color-convert": "^2.0.1" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==" + } + } + }, "wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", - "dev": true + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" }, "write-file-atomic": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz", "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==", - "dev": true, "requires": { "imurmurhash": "^0.1.4", "is-typedarray": "^1.0.0", @@ -4639,23 +9065,70 @@ "typedarray-to-buffer": "^3.1.5" } }, + "ws": { + "version": "7.4.0", + "resolved": "https://registry.npmjs.org/ws/-/ws-7.4.0.tgz", + "integrity": "sha512-kyFwXuV/5ymf+IXhS6f0+eAFvydbaBW3zjpT6hUdAh/hbVjTIB5EHBGi0bPoCLSK2wcuz3BrEkB9LrYv1Nm4NQ==" + }, "xdg-basedir": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-4.0.0.tgz", "integrity": "sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==", "dev": true }, + "xml-name-validator": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz", + "integrity": "sha512-A5CUptxDsvxKJEU3yO6DuWBSJz/qizqzJKOMIfUJHETbBw/sFaDxgd6fxm1ewUaM0jZ444Fc5vC5ROYurg/4Pw==" + }, "xmlbuilder": { "version": "15.1.1", "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-15.1.1.tgz", "integrity": "sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg==", "dev": true }, + "xmlchars": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz", + "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==" + }, "xtend": { "version": "4.0.2", "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz", "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==", "dev": true + }, + "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==" + }, + "yargs": { + "version": "15.4.1", + "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz", + "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==", + "requires": { + "cliui": "^6.0.0", + "decamelize": "^1.2.0", + "find-up": "^4.1.0", + "get-caller-file": "^2.0.1", + "require-directory": "^2.1.1", + "require-main-filename": "^2.0.0", + "set-blocking": "^2.0.0", + "string-width": "^4.2.0", + "which-module": "^2.0.0", + "y18n": "^4.0.0", + "yargs-parser": "^18.1.2" + } + }, + "yargs-parser": { + "version": "18.1.3", + "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz", + "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==", + "requires": { + "camelcase": "^5.0.0", + "decamelize": "^1.2.0" + } } } } diff --git a/package.json b/package.json index 946599b..cc4d538 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,8 @@ "mongo:start": "docker run --name realworld-mongo -p 27017:27017 mongo & sleep 5", "start": "node ./app.js", "dev": "nodemon ./app.js", - "mongo:stop": "docker stop realworld-mongo && docker rm realworld-mongo" + "mongo:stop": "docker stop realworld-mongo && docker rm realworld-mongo", + "test": "jest" }, "repository": { "type": "git", @@ -22,6 +23,7 @@ "express": "4.17.1", "express-jwt": "^6.0.0", "express-session": "1.17.1", + "jest": "^26.6.3", "joi": "^17.2.1", "jsonwebtoken": "8.5.1", "latest": "^0.2.0", @@ -40,5 +42,8 @@ "devDependencies": { "newman": "^5.2.0", "nodemon": "^2.0.4" + }, + "jest": { + "modulePathIgnorePatterns": ["local"] } } From 79de852d9170802ccd20250ffe08d57b97598dda Mon Sep 17 00:00:00 2001 From: Paul Bienkowski Date: Tue, 17 Nov 2020 18:07:21 +0100 Subject: [PATCH 03/22] chore: add prettier for autoformatting --- package-lock.json | 6 ++++++ package.json | 12 +++++++++++- 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/package-lock.json b/package-lock.json index 803c64a..dbb7b16 100644 --- a/package-lock.json +++ b/package-lock.json @@ -7369,6 +7369,12 @@ "integrity": "sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=", "dev": true }, + "prettier": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.1.2.tgz", + "integrity": "sha512-16c7K+x4qVlJg9rEbXl7HEGmQyZlG4R9AgP+oHKRMsMsuk8s+ATStlf1NpDqyBI1HpVyfjLOeMhH2LvuNvV5Vg==", + "dev": true + }, "pretty-format": { "version": "26.6.2", "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz", diff --git a/package.json b/package.json index cc4d538..4494b55 100644 --- a/package.json +++ b/package.json @@ -8,6 +8,7 @@ "start": "node ./app.js", "dev": "nodemon ./app.js", "mongo:stop": "docker stop realworld-mongo && docker rm realworld-mongo", + "autoformat": "prettier --write logic", "test": "jest" }, "repository": { @@ -41,9 +42,18 @@ }, "devDependencies": { "newman": "^5.2.0", - "nodemon": "^2.0.4" + "nodemon": "^2.0.4", + "prettier": "^2.1.2" }, "jest": { "modulePathIgnorePatterns": ["local"] + }, + "prettier": { + "useTabs": false, + "trailingComma": "all", + "tabWidth": 2, + "semi": true, + "singleQuote": true, + "printWidth": 120 } } From 04f597cfb1d40e66222e895fa4bbe834dfc1609f Mon Sep 17 00:00:00 2001 From: Paul Bienkowski Date: Tue, 17 Nov 2020 18:07:32 +0100 Subject: [PATCH 04/22] chore(logic): autoformat with prettier --- logic/TrackInfo.js | 7 +- logic/tracks.js | 198 ++++++++++++++++++++----------------------- logic/tracks.test.js | 9 +- 3 files changed, 100 insertions(+), 114 deletions(-) diff --git a/logic/TrackInfo.js b/logic/TrackInfo.js index 91efdfb..150981a 100644 --- a/logic/TrackInfo.js +++ b/logic/TrackInfo.js @@ -1,11 +1,8 @@ - class TrackInfo { - constructor(track,trackData) - { + constructor(track, trackData) { this.track = track; this.trackData = trackData; } } - -module.exports = TrackInfo +module.exports = TrackInfo; diff --git a/logic/tracks.js b/logic/tracks.js index 9bc9a26..2bc99cf 100644 --- a/logic/tracks.js +++ b/logic/tracks.js @@ -1,117 +1,107 @@ -module.exports.addPointsToTrack = function addPointsToTrack(track, body) -{ +module.exports.addPointsToTrack = function addPointsToTrack(track, body) { var num = 0; var start = 0; var end = 0; - //console.log("len"+body.length); + //console.log("len"+body.length); while (end < body.length) { start = end; - while (body[end] != ";" && body[end] != "$" && end < body.length) { + while (body[end] != ';' && body[end] != '$' && end < body.length) { end++; } - if(body[end] == "$") // $ is replacing \n as newlines are not allowed in json strings - { - num=0; + if (body[end] == '$') { + // $ is replacing \n as newlines are not allowed in json strings + num = 0; } - if(end < body.length) - { - var token = body.substr(start, end - start); - end++; - if(token.length>0) - { - //console.log(token); - //console.log("num:"+num); - //console.log("end:"+end); + if (end < body.length) { + var token = body.substr(start, end - start); + end++; + if (token.length > 0) { + //console.log(token); + //console.log("num:"+num); + //console.log("end:"+end); - if((num == 0) && (token == "Date")) - { - // we have a header line, ignore it for now, TODO parse it - if (end < body.length) { - while (body[end] != ";" && body[end] != "$" && end < body.length) { - end++; + if (num == 0 && token == 'Date') { + // we have a header line, ignore it for now, TODO parse it + if (end < body.length) { + while (body[end] != ';' && body[end] != '$' && end < body.length) { + end++; + } + start = end; + num = 100; + } + } + if (num == 0) { + track.trackData.points.push({ + date: 'dummy', + time: '', + latitude: '', + longitude: '', + course: '', + speed: '', + d1: '', + d2: '', + flag: '', + private: '', + }); + track.trackData.points[track.trackData.points.length - 1].date = token; + num++; + } else if (num == 1) { + track.trackData.points[track.trackData.points.length - 1].time = token; + num++; + } else if (num == 2) { + var f = parseFloat(token); + if (isNaN(f)) { + f = parseFloat(token.substring(0, 10)); + } + if (isNaN(f)) { + f = 0.0; + } + track.trackData.points[track.trackData.points.length - 1].latitude = f; + num++; + } else if (num == 3) { + var f = parseFloat(token); + if (isNaN(f)) { + f = parseFloat(token.substring(0, 10)); + } + if (isNaN(f)) { + f = 0.0; + } + track.trackData.points[track.trackData.points.length - 1].longitude = f; + num++; + } else if (num == 4) { + var f = parseFloat(token); + if (isNaN(f)) { + f = parseFloat(token.substring(0, 10)); + } + if (isNaN(f)) { + f = 0.0; + } + track.trackData.points[track.trackData.points.length - 1].course = f; + num++; + } else if (num == 5) { + var f = parseFloat(token); + if (isNaN(f)) { + f = parseFloat(token.substring(0, 10)); + } + if (isNaN(f)) { + f = 0.0; + } + track.trackData.points[track.trackData.points.length - 1].speed = f; + num++; + } else if (num == 6) { + track.trackData.points[track.trackData.points.length - 1].d1 = token; + num++; + } else if (num == 7) { + track.trackData.points[track.trackData.points.length - 1].d2 = token; + num++; + } else if (num == 8) { + track.trackData.points[track.trackData.points.length - 1].flag = token; + num++; + } else if (num == 9) { + track.trackData.points[track.trackData.points.length - 1].private = token; + num++; } - start = end; - num=100; } } - if (num == 0) { - track.trackData.points.push({ date: "dummy", time: "", latitude: "", longitude: "", course: "", speed: "", d1: "", d2: "", flag: "", private: ""}); - track.trackData.points[track.trackData.points.length - 1].date = token; - num++; - } - else if (num == 1) { - track.trackData.points[track.trackData.points.length - 1].time = token; - num++; - } - else if (num == 2) { - var f = parseFloat(token); - if(isNaN(f)) - { - f = parseFloat(token.substring(0,10)); - } - if(isNaN(f)) - { - f=0.0; - } - track.trackData.points[track.trackData.points.length - 1].latitude = f; - num++; - } - else if (num == 3) { - var f = parseFloat(token); - if(isNaN(f)) - { - f = parseFloat(token.substring(0,10)); - } - if(isNaN(f)) - { - f=0.0; - } - track.trackData.points[track.trackData.points.length - 1].longitude = f; - num++; - } - else if (num == 4) { - var f = parseFloat(token); - if(isNaN(f)) - { - f = parseFloat(token.substring(0,10)); - } - if(isNaN(f)) - { - f=0.0; - } - track.trackData.points[track.trackData.points.length - 1].course = f; - num++; - } - else if (num == 5) { - var f = parseFloat(token); - if(isNaN(f)) - { - f = parseFloat(token.substring(0,10)); - } - if(isNaN(f)) - { - f=0.0; - } - track.trackData.points[track.trackData.points.length - 1].speed = f; - num++; - } - else if (num == 6) { - track.trackData.points[track.trackData.points.length - 1].d1 = token; - num++; - } - else if (num == 7) { - track.trackData.points[track.trackData.points.length - 1].d2 = token; - num++; - } - else if (num == 8) { - track.trackData.points[track.trackData.points.length - 1].flag = token; - num++; - } - else if (num == 9) { - track.trackData.points[track.trackData.points.length - 1].private = token; - num++; - } - } - } } -} +}; diff --git a/logic/tracks.test.js b/logic/tracks.test.js index e438bcf..221a41f 100644 --- a/logic/tracks.test.js +++ b/logic/tracks.test.js @@ -1,8 +1,7 @@ -var {addPointsToTrack} = require('./tracks') +var { addPointsToTrack } = require('./tracks'); describe('addPointsToTrack', () => { it('is a function', () => { - expect(typeof addPointsToTrack).toBe('function') - }) -}) - + expect(typeof addPointsToTrack).toBe('function'); + }); +}); From 8f5237a182bb9246de28eaba88c2ed3a4b9ca650 Mon Sep 17 00:00:00 2001 From: Paul Bienkowski Date: Tue, 17 Nov 2020 18:24:13 +0100 Subject: [PATCH 05/22] test: add test data from postman-test to test `addPointsToTrack` --- logic/_tracks_testdata.js | 4 ++++ logic/tracks.test.js | 22 ++++++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 logic/_tracks_testdata.js diff --git a/logic/_tracks_testdata.js b/logic/_tracks_testdata.js new file mode 100644 index 0000000..f9364dd --- /dev/null +++ b/logic/_tracks_testdata.js @@ -0,0 +1,4 @@ +module.exports = { + test1: + 'Date;Time;Latitude;Longitude;Course;Speed;Right;Left;Confirmed;insidePrivacyArea;$12.07.2020;09:02:59;0.000000;0.000000;0.000;0.0000;255;255;0;0;$12.07.2020;09:02:59;0.000000;0.000000;0.000;0.0000;255;255;0;0;$12.07.2020;09:03:00;0.000000;0.000000;0.000;0.0000;255;255;0;0;$12.07.2020;09:03:01;48.722205;9.270218;0.000;0.4260;255;255;0;0;$12.07.2020;09:03:02;48.722206;9.270219;0.000;0.5741;255;255;0;0;$12.07.2020;09:03:03;48.722204;9.270221;0.000;0.5371;255;255;0;0;$12.07.2020;09:03:04;48.722198;9.270229;0.000;0.7593;255;255;0;0;$12.07.2020;09:03:05;48.722188;9.270241;0.000;0.5556;255;255;0;0;$12.07.2020;09:03:06;48.722174;9.270259;0.000;0.4815;255;255;0;0;$12.07.2020;09:03:07;48.722158;9.270278;0.000;0.3704;255;255;0;0;$12.07.2020;09:03:08;48.722146;9.270293;0.000;0.5741;255;255;0;0;$12.07.2020;09:03:09;48.722138;9.270305;0.000;1.2594;255;255;0;0;$12.07.2020;09:03:10;48.722129;9.270318;0.000;1.5557;255;255;0;0;$12.07.2020;09:03:11;48.722122;9.270329;0.000;1.5372;255;255;0;0;$12.07.2020;09:03:12;48.722115;9.270339;0.000;0.4630;255;255;0;0;$12.07.2020;09:03:13;48.722107;9.270350;0.000;0.2963;255;255;0;0;$12.07.2020;09:03:14;48.722101;9.270357;0.000;0.2963;255;255;0;0;$12.07.2020;09:03:15;48.722092;9.270367;0.000;0.8149;255;255;0;0;$12.07.2020;09:03:16;48.722084;9.270377;0.000;1.2223;255;255;0;0;$12.07.2020;09:03:17;48.722076;9.270385;0.000;0.0926;255;255;0;0;$12.07.2020;09:03:18;48.722070;9.270391;0.000;1.4816;255;255;0;0;$12.07.2020;09:03:19;48.722070;9.270392;0.000;1.0927;255;255;0;0;$12.07.2020;09:03:20;48.722066;9.270395;0.000;1.6668;255;255;0;0;$12.07.2020;09:03:21;48.722068;9.270391;0.000;2.0742;255;255;0;0;$12.07.2020;09:03:22;48.722064;9.270396;0.000;1.6853;255;255;0;0;$12.07.2020;09:03:23;48.722060;9.270401;0.000;1.0927;255;255;0;0;$12.07.2020;09:03:24;48.722056;9.270406;0.000;0.9445;255;255;0;0;$12.07.2020;09:03:25;48.722052;9.270411;0.000;0.7964;255;255;0;0;$12.07.2020;09:03:26;48.722047;9.270416;0.000;0.6482;255;255;0;0;$12.07.2020;09:03:27;48.722042;9.270419;0.000;1.0556;255;255;0;0;$12.07.2020;09:03:28;48.722031;9.270433;0.000;2.0372;255;255;0;0;$12.07.2020;09:03:29;48.722031;9.270432;0.000;2.4261;255;255;0;0;$12.07.2020;09:03:30;48.722029;9.270433;0.000;0.8704;255;255;0;0;$12.07.2020;09:03:31;48.722029;9.270433;0.000;1.8150;255;255;0;0;$12.07.2020;09:03:32;48.722024;9.270439;0.000;1.2223;255;255;0;0;$12.07.2020;09:03:33;48.722025;9.270439;0.000;0.3889;255;255;0;0;$12.07.2020;09:03:34;48.722022;9.270440;0.000;0.3519;255;255;0;0;$12.07.2020;09:03:35;48.722020;9.270445;0.000;0.9445;255;255;0;0;$12.07.2020;09:03:36;48.722018;9.270447;0.000;0.9260;255;255;0;0;$12.07.2020;09:03:37;48.722020;9.270444;0.000;0.9075;255;255;0;0;$12.07.2020;09:03:38;48.722021;9.270443;0.000;1.9261;255;255;0;0;$12.07.2020;09:03:39;48.722018;9.270447;0.000;0.3334;255;255;0;0;$12.07.2020;09:03:40;48.722020;9.270445;0.000;0.1482;255;255;0;0;$12.07.2020;09:03:41;48.722023;9.270440;0.000;1.2594;255;255;0;0;$12.07.2020;09:03:42;48.722023;9.270442;0.000;0.5000;255;255;0;0;$12.07.2020;09:03:43;48.722025;9.270440;0.000;0.6852;220;255;0;0;$12.07.2020;09:03:44;48.722023;9.270441;0.000;0.8519;199;255;0;0;$12.07.2020;09:03:45;48.722026;9.270438;0.000;1.4075;255;255;0;0;$12.07.2020;09:03:46;48.722029;9.270436;0.000;0.5371;255;255;0;0;$12.07.2020;09:03:47;48.722028;9.270435;0.000;0.8334;97;255;0;0;$12.07.2020;09:03:48;48.722029;9.270435;0.000;0.3704;255;255;0;0;$12.07.2020;09:03:49;48.722029;9.270436;0.000;1.1112;96;255;0;0;$12.07.2020;09:03:50;48.722029;9.270435;0.000;1.8890;255;255;0;0;$12.07.2020;09:03:51;48.722034;9.270429;0.000;1.0186;255;255;0;0;$12.07.2020;09:03:52;48.721942;9.270529;128.450;5.2226;255;255;0;0;$12.07.2020;09:03:53;48.721929;9.270546;128.450;1.3520;255;255;0;0;$12.07.2020;09:03:53;48.721929;9.270546;128.450;1.3520;79;255;0;0;$12.07.2020;09:03:53;48.721929;9.270546;128.450;1.3520;178;255;0;0;$12.07.2020;09:03:53;48.721929;9.270546;128.450;1.3520;89;255;0;0;$12.07.2020;09:03:53;48.721929;9.270546;128.450;1.3520;255;255;0;0;$12.07.2020;09:03:53;48.721929;9.270546;128.450;1.3520;156;255;0;0;$12.07.2020;09:03:53;48.721929;9.270546;128.450;1.3520;255;255;0;0;$12.07.2020;09:03:53;48.721929;9.270546;128.450;1.3520;255;255;0;0;$12.07.2020;09:03:53;48.721929;9.270546;128.450;1.3520;255;255;0;0;$12.07.2020;09:03:53;48.721929;9.270546;128.450;1.3520;255;255;0;0;$12.07.2020;09:03:53;48.721929;9.270546;128.450;1.3520;168;255;0;0;$12.07.2020;09:03:53;48.721929;9.270546;128.450;1.3520;255;255;0;0;$12.07.2020;09:03:53;48.721929;9.270546;128.450;1.3520;255;181;0;0;$12.07.2020;09:03:53;48.721929;9.270546;128.450;1.3520;255;176;0;0;$12.07.2020;09:03:53;48.721929;9.270546;128.450;1.3520;255;186;0;0;$12.07.2020;09:03:53;48.721929;9.270546;128.450;1.3520;255;255;0;0;$12.07.2020;09:04:10;48.721896;9.270602;916.230;0.0556;255;255;0;0;$12.07.2020;09:04:11;48.721894;9.270609;916.230;0.0926;255;192;0;0;$12.07.2020;09:04:12;48.721892;9.270616;916.230;0.0556;255;255;0;0;$12.07.2020;09:04:13;48.721890;9.270623;916.230;0.0370;255;255;0;0;$12.07.2020;09:04:14;48.721888;9.270629;916.230;0.0926;255;255;0;0;$12.07.2020;09:04:15;48.721886;9.270635;916.230;0.0926;255;255;0;0;$12.07.2020;09:04:16;48.721883;9.270640;916.230;0.0556;255;255;0;0;$12.07.2020;09:04:17;48.721881;9.270644;916.230;0.0370;255;255;0;0;$12.07.2020;09:04:18;48.721879;9.270649;916.230;0.1111;255;255;0;0;$12.07.2020;09:04:19;48.721877;9.270653;916.230;0.1296;255;255;0;0;$12.07.2020;09:04:20;48.721876;9.270657;916.230;0.0926;255;255;0;0;$12.07.2020;09:04:21;48.721874;9.270658;916.230;0.3148;255;255;0;0;$12.07.2020;09:04:22;48.721873;9.270659;916.230;0.0370;255;255;0;0;$12.07.2020;09:04:23;48.721872;9.270661;916.230;0.0741;255;255;0;0;$12.07.2020;09:04:24;48.721871;9.270661;916.230;0.0926;255;255;0;0;$12.07.2020;09:04:25;48.721870;9.270660;916.230;0.3334;255;255;0;0;$12.07.2020;09:04:26;48.721869;9.270658;916.230;0.5000;255;255;0;0;$12.07.2020;09:04:27;48.721866;9.270660;916.230;1.6853;255;255;0;0;$12.07.2020;09:04:28;48.721866;9.270659;916.230;0.8704;255;198;0;0;$12.07.2020;09:04:29;48.721867;9.270659;916.230;0.5741;255;196;0;0;$12.07.2020;09:04:30;48.721867;9.270660;916.230;0.3148;255;196;0;0;$12.07.2020;09:04:31;48.721867;9.270659;916.230;0.1111;255;255;0;0;$12.07.2020;09:04:32;48.721866;9.270659;916.230;0.0556;255;199;0;0;$12.07.2020;09:04:33;48.721867;9.270656;916.230;0.1482;255;199;0;0;$12.07.2020;09:04:34;48.721867;9.270654;916.230;0.0370;255;198;0;0;$12.07.2020;09:04:35;48.721867;9.270653;916.230;0.1296;255;198;0;0;$12.07.2020;09:04:36;48.721867;9.270651;916.230;0.1667;255;255;0;0;$12.07.2020;09:04:37;48.721867;9.270650;916.230;0.0741;255;255;0;0;$12.07.2020;09:04:38;48.721868;9.270650;916.230;0.1852;255;255;0;0;$12.07.2020;09:04:39;48.721868;9.270649;916.230;0.1667;255;201;0;0;$12.07.2020;09:04:40;48.721868;9.270647;916.230;0.0926;255;255;0;0;$12.07.2020;09:04:41;48.721869;9.270644;916.230;0.0185;255;255;0;0;$12.07.2020;09:04:42;48.721869;9.270641;916.230;0.0185;255;198;0;0;$12.07.2020;09:04:43;48.721870;9.270638;916.230;0.0926;255;255;0;0;$12.07.2020;09:04:44;48.721870;9.270635;916.230;0.0370;255;199;0;0;$12.07.2020;09:04:45;48.721871;9.270632;916.230;0.1482;255;204;0;0;$12.07.2020;09:04:46;48.721871;9.270630;916.230;0.0185;255;201;0;0;$12.07.2020;09:04:47;48.721873;9.270630;916.230;0.0926;255;255;0;0;$12.07.2020;09:04:48;48.721873;9.270629;916.230;0.0370;255;255;0;0;$12.07.2020;09:04:49;48.721874;9.270628;916.230;0.4074;255;255;0;0;$12.07.2020;09:04:50;48.721875;9.270627;916.230;0.2222;255;255;0;0;$12.07.2020;09:04:51;48.721876;9.270625;916.230;0.1667;255;255;0;0;$12.07.2020;09:04:52;48.721877;9.270623;916.230;0.1111;255;255;0;0;$12.07.2020;09:04:53;48.721877;9.270622;916.230;0.2037;255;255;0;0;$12.07.2020;09:04:54;48.721879;9.270621;916.230;0.3148;255;255;0;0;$12.07.2020;09:04:55;48.721881;9.270618;916.230;0.2408;255;255;0;0;$12.07.2020;09:04:56;48.721883;9.270615;916.230;0.3148;255;255;0;0;$12.07.2020;09:04:57;48.721884;9.270612;916.230;0.2778;255;255;0;0;$12.07.2020;09:04:58;48.721885;9.270609;916.230;0.1296;255;255;0;0;$12.07.2020;09:04:59;48.721886;9.270606;916.230;0.0370;255;255;0;0;$12.07.2020;09:05:00;48.721888;9.270602;916.230;0.0370;255;255;0;0;$12.07.2020;09:05:01;48.721889;9.270598;916.230;0.1111;255;191;0;0;$12.07.2020;09:05:02;48.721890;9.270595;916.230;0.1482;255;193;0;0;$12.07.2020;09:05:03;48.721891;9.270593;916.230;0.0741;255;255;0;0;$12.07.2020;09:05:04;48.721891;9.270591;916.230;0.1667;255;255;0;0;$12.07.2020;09:05:05;48.721891;9.270589;916.230;0.1296;255;255;0;0;$12.07.2020;09:05:06;48.721891;9.270587;916.230;0.3519;255;199;0;0;$12.07.2020;09:05:07;48.721891;9.270586;916.230;0.2222;255;255;0;0;$12.07.2020;09:05:08;48.721891;9.270588;916.230;0.1667;255;255;0;0;$12.07.2020;09:05:09;48.721890;9.270589;916.230;0.1667;255;255;0;0;$12.07.2020;09:05:10;48.721889;9.270589;916.230;0.2222;255;255;0;0;$12.07.2020;09:05:11;48.721888;9.270589;916.230;0.1482;255;255;0;0;$12.07.2020;09:05:12;48.721887;9.270589;916.230;0.1296;255;255;0;0;$12.07.2020;09:05:13;48.721886;9.270590;916.230;0.1667;255;255;0;0;$12.07.2020;09:05:14;48.721885;9.270591;916.230;0.3148;255;255;0;0;$12.07.2020;09:05:15;48.721885;9.270592;916.230;0.2037;255;255;0;0;$12.07.2020;09:05:16;48.721885;9.270596;916.230;0.5556;255;255;0;0;$12.07.2020;09:05:17;48.721885;9.270598;916.230;0.3519;255;255;0;0;$12.07.2020;09:05:18;48.721884;9.270600;916.230;0.0370;255;255;0;0;$12.07.2020;09:05:19;48.721882;9.270600;916.230;0.1667;255;255;0;0;$12.07.2020;09:05:20;48.721881;9.270602;916.230;0.0556;255;255;0;0;$12.07.2020;09:05:21;48.721879;9.270603;916.230;0.0185;255;206;0;0;$12.07.2020;09:05:22;48.721878;9.270605;916.230;0.0556;255;203;0;0;$12.07.2020;09:05:23;48.721876;9.270606;916.230;0.0741;255;255;0;0;$12.07.2020;09:05:24;48.721874;9.270605;916.230;0.0185;255;255;0;0;$12.07.2020;09:05:25;48.721873;9.270605;916.230;0.0370;255;255;0;0;$12.07.2020;09:05:26;48.721872;9.270605;916.230;0.1296;255;209;0;0;$12.07.2020;09:05:27;48.721870;9.270606;916.230;0.0556;255;255;0;0;$12.07.2020;09:05:28;48.721869;9.270608;916.230;0.1111;255;206;0;0;$12.07.2020;09:05:29;48.721868;9.270610;916.230;0.3148;255;209;0;0;$12.07.2020;09:05:30;48.721867;9.270610;916.230;0.2593;255;208;0;0;$12.07.2020;09:05:31;48.721866;9.270611;916.230;0.0556;255;210;0;0;$12.07.2020;09:05:32;48.721866;9.270612;916.230;0.2222;255;255;0;0;$12.07.2020;09:05:32;48.721866;9.270612;916.230;0.2222;255;255;0;0;$12.07.2020;09:05:32;48.721866;9.270612;916.230;0.2222;255;255;0;0;$12.07.2020;09:05:32;48.721866;9.270612;916.230;0.2222;255;255;0;0;$12.07.2020;09:05:32;48.721866;9.270612;916.230;0.2222;255;255;0;0;$12.07.2020;09:05:32;48.721866;9.270612;916.230;0.2222;255;255;0;0;$12.07.2020;09:05:32;48.721866;9.270612;916.230;0.2222;255;255;0;0;$12.07.2020;09:05:32;48.721866;9.270612;916.230;0.2222;255;255;0;0;$12.07.2020;09:05:32;48.721866;9.270612;916.230;0.2222;255;255;0;0;$12.07.2020;09:05:32;48.721866;9.270612;916.230;0.2222;255;255;0;0;$12.07.2020;09:05:32;48.721866;9.270612;916.230;0.2222;255;255;0;0;$12.07.2020;09:05:44;48.721855;9.270602;916.230;0.2222;255;255;0;0;$12.07.2020;09:05:44;48.721855;9.270602;916.230;0.2222;255;255;0;0;$12.07.2020;09:05:46;48.721854;9.270602;916.230;0.1667;255;255;0;0;$12.07.2020;09:05:46;48.721854;9.270602;916.230;0.1667;255;255;0;0;$12.07.2020;09:05:48;48.721852;9.270606;916.230;0.0926;255;255;0;0;$12.07.2020;09:05:49;48.721851;9.270611;916.230;0.1482;255;255;0;0;$12.07.2020;09:05:50;48.721851;9.270615;916.230;0.1852;255;255;0;0;$12.07.2020;09:05:51;48.721851;9.270616;916.230;0.0185;255;255;0;0;$12.07.2020;09:05:52;48.721851;9.270617;916.230;0.0926;255;255;0;0;$12.07.2020;09:05:53;48.721852;9.270617;916.230;0.0185;255;255;0;0;$12.07.2020;09:05:54;48.721853;9.270616;916.230;0.0741;255;255;0;0;$12.07.2020;09:05:55;48.721855;9.270613;916.230;0.0556;255;255;0;0;$12.07.2020;09:05:56;48.721858;9.270609;916.230;0.6482;255;255;0;0;$12.07.2020;09:05:57;48.721860;9.270606;916.230;0.4260;255;255;0;0;$12.07.2020;09:05:58;48.721864;9.270601;916.230;0.6297;255;255;0;0;$12.07.2020;09:05:59;48.721867;9.270595;916.230;0.4260;255;255;0;0;$12.07.2020;09:06:00;48.721872;9.270589;916.230;0.5000;255;255;0;0;$12.07.2020;09:06:01;48.721875;9.270584;916.230;0.2593;255;255;0;0;$12.07.2020;09:06:02;48.721880;9.270578;916.230;0.5186;255;255;0;0;$12.07.2020;09:06:03;48.721883;9.270574;916.230;0.2222;255;255;0;0;$12.07.2020;09:06:04;48.721886;9.270570;916.230;0.1667;255;255;0;0;$12.07.2020;09:06:05;48.721890;9.270565;916.230;0.2408;255;255;0;0;$12.07.2020;09:06:06;48.721893;9.270562;916.230;0.2593;255;255;0;0;$12.07.2020;09:06:07;48.721893;9.270560;916.230;0.0926;255;255;0;0;$12.07.2020;09:06:08;48.721894;9.270559;916.230;0.0741;255;255;0;0;$12.07.2020;09:06:09;48.721894;9.270557;916.230;0.0741;255;255;0;0;$12.07.2020;09:06:07;48.721896;9.270556;916.230;0.2778;255;255;0;0;$12.07.2020;09:06:08;48.721896;9.270556;916.230;0.2408;255;255;0;0;$12.07.2020;09:06:09;48.721895;9.270557;916.230;0.0926;255;255;0;0;$12.07.2020;09:06:10;48.721894;9.270559;916.230;0.1482;255;255;0;0;$12.07.2020;09:06:11;48.721892;9.270560;916.230;0.2037;255;255;0;0;$12.07.2020;09:06:12;48.721891;9.270561;916.230;0.1296;255;255;0;0;$12.07.2020;09:06:13;48.721892;9.270562;916.230;0.1852;255;255;0;0;$12.07.2020;09:06:14;48.721891;9.270564;916.230;0.0741;255;255;0;0;$12.07.2020;09:06:15;48.721889;9.270566;916.230;0.1482;255;255;0;0;$12.07.2020;09:06:16;48.721888;9.270568;916.230;0.0370;255;255;0;0;$12.07.2020;09:06:17;48.721888;9.270570;916.230;0.2037;255;255;0;0;$12.07.2020;09:06:18;48.721888;9.270572;916.230;0.4630;255;255;0;0;$12.07.2020;09:06:19;48.721887;9.270573;916.230;0.4815;255;255;0;0;$12.07.2020;09:06:20;48.721886;9.270574;916.230;0.3334;255;255;0;0;$12.07.2020;09:06:21;48.721885;9.270576;916.230;0.1852;255;255;0;0;$12.07.2020;09:06:22;48.721884;9.270579;916.230;0.0926;255;255;0;0;$12.07.2020;09:06:23;48.721882;9.270581;916.230;0.0741;255;255;0;0;$12.07.2020;09:06:24;48.721881;9.270584;916.230;0.0741;255;255;0;0;$12.07.2020;09:06:25;48.721880;9.270589;916.230;0.2963;255;255;0;0;$12.07.2020;09:06:26;48.721879;9.270596;916.230;0.3519;255;255;0;0;$12.07.2020;09:06:27;48.721878;9.270602;916.230;0.1111;255;255;0;0;$12.07.2020;09:06:28;48.721876;9.270601;916.230;0.0926;255;255;0;0;$12.07.2020;09:06:29;48.721874;9.270603;916.230;0.0926;255;255;0;0;$12.07.2020;09:06:30;48.721873;9.270607;916.230;0.0926;255;255;0;0;$12.07.2020;09:06:31;48.721872;9.270614;916.230;0.2037;255;255;0;0;$12.07.2020;09:06:32;48.721870;9.270613;916.230;0.0370;255;255;0;0;$12.07.2020;09:06:33;48.721869;9.270614;916.230;0.0926;255;255;0;0;$12.07.2020;09:06:34;48.721868;9.270616;916.230;0.1111;255;255;0;0;$12.07.2020;09:06:35;48.721867;9.270617;916.230;0.2593;255;255;0;0;$12.07.2020;09:06:36;48.721867;9.270618;916.230;0.1852;255;255;0;0;$12.07.2020;09:06:37;48.721867;9.270618;916.230;0.1296;255;255;0;0;$12.07.2020;09:06:38;48.721867;9.270616;916.230;0.2963;255;255;0;0;$12.07.2020;09:06:39;48.721867;9.270613;916.230;0.1296;255;255;0;0;$12.07.2020;09:06:40;48.721867;9.270607;916.230;0.0185;255;255;0;0;$12.07.2020;09:06:41;48.721866;9.270601;916.230;0.5186;255;255;0;0;$12.07.2020;09:06:42;48.721866;9.270593;916.230;0.2963;255;255;0;0;$12.07.2020;09:06:43;48.721866;9.270587;916.230;0.0741;255;255;0;0;$12.07.2020;09:06:44;48.721866;9.270581;916.230;0.0370;255;255;0;0;$12.07.2020;09:06:45;48.721866;9.270576;916.230;0.0370;255;255;0;0;$12.07.2020;09:06:46;48.721866;9.270567;916.230;0.1111;255;255;0;0;$12.07.2020;09:06:47;48.721866;9.270558;916.230;0.4074;255;255;0;0;$12.07.2020;09:06:48;48.721866;9.270550;916.230;0.4260;255;255;0;0;$12.07.2020;09:06:49;48.721866;9.270543;916.230;0.0370;255;255;0;0;$12.07.2020;09:06:50;48.721867;9.270537;916.230;0.2778;255;255;0;0;$12.07.2020;09:06:51;48.721867;9.270532;916.230;0.2037;255;255;0;0;$12.07.2020;09:06:52;48.721867;9.270526;916.230;0.3148;255;255;0;0;$12.07.2020;09:06:53;48.721868;9.270522;916.230;0.0741;255;255;0;0;$12.07.2020;09:06:54;48.721868;9.270517;916.230;0.0741;255;255;0;0;$12.07.2020;09:06:55;48.721869;9.270512;916.230;0.2222;255;255;0;0;$12.07.2020;09:06:56;48.721869;9.270506;916.230;0.2408;255;255;0;0;$12.07.2020;09:06:57;48.721869;9.270503;916.230;0.1111;255;255;0;0;$12.07.2020;09:06:58;48.721870;9.270500;916.230;0.0370;255;255;0;0;$12.07.2020;09:06:59;48.721870;9.270497;916.230;0.1296;255;255;0;0;$12.07.2020;09:07:00;48.721871;9.270494;916.230;0.1296;255;255;0;0;$12.07.2020;09:07:01;48.721871;9.270493;916.230;0.1482;255;255;0;0;$12.07.2020;09:07:02;48.721871;9.270492;916.230;0.2037;255;255;0;0;$12.07.2020;09:07:03;48.721872;9.270490;916.230;0.0370;255;255;0;0;$12.07.2020;09:07:04;48.721873;9.270489;916.230;0.6667;255;255;0;0;$12.07.2020;09:07:05;48.721873;9.270487;916.230;0.0370;255;255;0;0;$12.07.2020;09:07:06;48.721873;9.270486;916.230;0.2222;255;255;0;0;$12.07.2020;09:07:07;48.721873;9.270486;916.230;0.2408;255;255;0;0;$12.07.2020;09:07:08;48.721873;9.270485;916.230;0.1852;255;255;0;0;$12.07.2020;09:07:09;48.721873;9.270485;916.230;0.2037;255;255;0;0;$12.07.2020;09:07:10;48.721872;9.270485;916.230;0.1296;255;255;0;0;$12.07.2020;09:07:11;48.721870;9.270486;916.230;0.0370;255;255;0;0;$12.07.2020;09:07:12;48.721869;9.270489;916.230;0.2037;255;255;0;0;$12.07.2020;09:07:13;48.721867;9.270492;916.230;0.3148;255;255;0;0;$12.07.2020;09:07:14;48.721865;9.270494;916.230;0.2037;255;255;0;0;$12.07.2020;09:07:15;48.721863;9.270495;916.230;0.1667;255;255;0;0;$12.07.2020;09:07:16;48.721861;9.270497;916.230;0.0000;255;255;0;0;$12.07.2020;09:07:17;48.721860;9.270496;916.230;0.4074;255;255;0;0;$12.07.2020;09:07:18;48.721859;9.270495;916.230;0.4445;255;255;0;0;$12.07.2020;09:07:19;48.721857;9.270496;916.230;0.3889;255;255;0;0;$12.07.2020;09:07:20;48.721856;9.270496;916.230;0.1667;255;255;0;0;$12.07.2020;09:07:21;48.721854;9.270494;916.230;0.7593;255;255;0;0;$12.07.2020;09:07:22;48.721851;9.270496;916.230;0.0926;255;255;0;0;$12.07.2020;09:07:23;48.721850;9.270497;916.230;0.1667;255;255;0;0;$12.07.2020;09:07:24;48.721848;9.270501;916.230;0.4074;255;255;0;0;$12.07.2020;09:07:25;48.721847;9.270504;916.230;0.4074;255;255;0;0;$12.07.2020;09:07:26;48.721846;9.270505;916.230;0.2037;255;255;0;0;$12.07.2020;09:07:27;48.721844;9.270508;916.230;0.1111;255;255;0;0;$12.07.2020;09:07:28;48.721843;9.270507;916.230;0.4630;255;255;0;0;$12.07.2020;09:07:29;48.721842;9.270509;916.230;0.1111;255;255;0;0;$12.07.2020;09:07:30;48.721841;9.270512;916.230;0.0926;255;255;0;0;$12.07.2020;09:07:31;48.721840;9.270515;916.230;0.0926;255;255;0;0;$12.07.2020;09:07:32;48.721839;9.270517;916.230;0.1482;255;255;0;0;$12.07.2020;09:07:33;48.721838;9.270522;916.230;0.0556;255;255;0;0;$12.07.2020;09:07:34;48.721838;9.270527;916.230;0.3889;255;255;0;0;$12.07.2020;09:07:35;48.721837;9.270530;916.230;0.1482;255;255;0;0;$12.07.2020;09:07:36;48.721836;9.270532;916.230;0.1111;255;255;0;0;$12.07.2020;09:07:37;48.721835;9.270536;916.230;0.6112;255;255;0;0;$12.07.2020;09:07:38;48.721835;9.270541;916.230;1.1668;255;255;0;0;$12.07.2020;09:07:39;48.721835;9.270543;916.230;0.3889;255;255;0;0;$12.07.2020;09:07:40;48.721834;9.270545;916.230;0.5000;255;255;0;0;$12.07.2020;09:07:41;48.721834;9.270544;916.230;0.1482;255;255;0;0;$12.07.2020;09:07:42;48.721834;9.270545;916.230;0.7593;255;255;0;0;$12.07.2020;09:07:43;48.721834;9.270545;916.230;0.8890;255;255;0;0;$12.07.2020;09:07:44;48.721834;9.270543;916.230;0.4260;255;255;0;0;$12.07.2020;09:07:45;48.721834;9.270541;916.230;0.2408;255;255;0;0;$12.07.2020;09:07:46;48.721834;9.270540;916.230;0.3148;255;255;0;0;$12.07.2020;09:07:47;48.721835;9.270538;916.230;0.0741;255;255;0;0;$12.07.2020;09:07:48;48.721835;9.270535;916.230;0.0556;255;255;0;0;$12.07.2020;09:07:49;48.721835;9.270534;916.230;0.8890;255;255;0;0;$12.07.2020;09:07:50;48.721835;9.270534;916.230;0.5926;255;255;0;0;$12.07.2020;09:07:51;48.721835;9.270534;916.230;0.7593;255;255;0;0;$12.07.2020;09:07:52;48.721836;9.270533;916.230;0.2408;255;255;0;0;$12.07.2020;09:07:53;48.721836;9.270531;916.230;0.0741;255;255;0;0;$12.07.2020;09:07:54;48.721836;9.270529;916.230;0.3889;255;255;0;0;$12.07.2020;09:07:55;48.721836;9.270530;916.230;0.2222;255;255;0;0;$12.07.2020;09:07:56;48.721836;9.270530;916.230;0.0185;255;255;0;0;$12.07.2020;09:07:57;48.721837;9.270531;916.230;0.0185;255;255;0;0;$12.07.2020;09:07:58;48.721837;9.270530;916.230;0.1482;255;255;0;0;$12.07.2020;09:07:59;48.721838;9.270526;916.230;0.3519;255;255;0;0;$12.07.2020;09:08:00;48.721838;9.270521;916.230;0.4260;255;255;0;0;$12.07.2020;09:08:01;48.721839;9.270522;916.230;0.5556;255;255;0;0;$12.07.2020;09:08:02;48.721840;9.270524;916.230;0.3519;255;255;0;0;$12.07.2020;09:08:03;48.721842;9.270525;916.230;0.2963;255;255;0;0;$12.07.2020;09:08:04;48.721843;9.270525;916.230;0.1482;255;255;0;0;$12.07.2020;09:08:05;48.721844;9.270524;916.230;0.2222;255;255;0;0;$12.07.2020;09:08:06;48.721846;9.270522;916.230;0.3704;255;255;0;0;$12.07.2020;09:08:07;48.721847;9.270519;916.230;0.1482;255;255;0;0;$12.07.2020;09:08:08;48.721848;9.270516;916.230;0.0926;255;255;0;0;$12.07.2020;09:08:09;48.721849;9.270514;916.230;0.1296;255;255;0;0;$12.07.2020;09:08:10;48.721850;9.270512;916.230;0.1482;255;255;0;0;$12.07.2020;09:08:11;48.721851;9.270513;916.230;0.3334;255;255;0;0;$12.07.2020;09:08:12;48.721851;9.270512;916.230;0.0926;255;255;0;0;$12.07.2020;09:08:13;48.721851;9.270512;916.230;0.2593;255;255;0;0;$12.07.2020;09:08:14;48.721852;9.270511;916.230;0.0926;255;255;0;0;$12.07.2020;09:08:15;48.721853;9.270512;916.230;0.0370;255;255;0;0;$12.07.2020;09:08:16;48.721852;9.270515;916.230;0.5371;255;255;0;0;$12.07.2020;09:08:17;48.721853;9.270517;916.230;0.1482;255;255;0;0;$12.07.2020;09:08:18;48.721854;9.270519;916.230;0.3148;255;255;0;0;$12.07.2020;09:08:19;48.721855;9.270520;916.230;0.2408;255;255;0;0;$12.07.2020;09:08:20;48.721856;9.270523;916.230;0.3704;255;255;0;0;$', +}; diff --git a/logic/tracks.test.js b/logic/tracks.test.js index 221a41f..34b9f95 100644 --- a/logic/tracks.test.js +++ b/logic/tracks.test.js @@ -1,7 +1,29 @@ var { addPointsToTrack } = require('./tracks'); +var TrackInfo = require('./TrackInfo'); + +var { test1 } = require('./_tracks_testdata'); describe('addPointsToTrack', () => { it('is a function', () => { expect(typeof addPointsToTrack).toBe('function'); }); + + it('works on the sample data with an empty track', () => { + const trackInfo = new TrackInfo({}, { points: [] }); + addPointsToTrack(trackInfo, test1); + var points = trackInfo.trackData.points; + expect(points).toHaveLength(324); + expect(points[0]).toEqual({ + date: '12.07.2020', + time: '09:02:59', + latitude: 0, + longitude: 0, + course: 0, + speed: 0, + d1: '255', + d2: '255', + flag: '0', + private: '0', + }); + }); }); From 214da0c9f8e51d622e7af3252f6270c1578659e8 Mon Sep 17 00:00:00 2001 From: Paul Bienkowski Date: Tue, 17 Nov 2020 18:24:49 +0100 Subject: [PATCH 06/22] refactor(logic/tracks): clean up code --- logic/tracks.js | 150 ++++++++++++++++++++++++------------------------ 1 file changed, 75 insertions(+), 75 deletions(-) diff --git a/logic/tracks.js b/logic/tracks.js index 2bc99cf..f74a434 100644 --- a/logic/tracks.js +++ b/logic/tracks.js @@ -1,8 +1,23 @@ +function _parseFloat(token) { + var f = parseFloat(token); + if (isNaN(f)) { + f = parseFloat(token.substring(0, 10)); + } + if (isNaN(f)) { + f = 0.0; + } + return f; +} + module.exports.addPointsToTrack = function addPointsToTrack(track, body) { var num = 0; var start = 0; var end = 0; - //console.log("len"+body.length); + + // reference to the array we will mutate + var points = track.trackData.points; + var currentPoint; + while (end < body.length) { start = end; while (body[end] != ';' && body[end] != '$' && end < body.length) { @@ -15,11 +30,8 @@ module.exports.addPointsToTrack = function addPointsToTrack(track, body) { if (end < body.length) { var token = body.substr(start, end - start); end++; - if (token.length > 0) { - //console.log(token); - //console.log("num:"+num); - //console.log("end:"+end); + if (token.length > 0) { if (num == 0 && token == 'Date') { // we have a header line, ignore it for now, TODO parse it if (end < body.length) { @@ -30,77 +42,65 @@ module.exports.addPointsToTrack = function addPointsToTrack(track, body) { num = 100; } } - if (num == 0) { - track.trackData.points.push({ - date: 'dummy', - time: '', - latitude: '', - longitude: '', - course: '', - speed: '', - d1: '', - d2: '', - flag: '', - private: '', - }); - track.trackData.points[track.trackData.points.length - 1].date = token; - num++; - } else if (num == 1) { - track.trackData.points[track.trackData.points.length - 1].time = token; - num++; - } else if (num == 2) { - var f = parseFloat(token); - if (isNaN(f)) { - f = parseFloat(token.substring(0, 10)); - } - if (isNaN(f)) { - f = 0.0; - } - track.trackData.points[track.trackData.points.length - 1].latitude = f; - num++; - } else if (num == 3) { - var f = parseFloat(token); - if (isNaN(f)) { - f = parseFloat(token.substring(0, 10)); - } - if (isNaN(f)) { - f = 0.0; - } - track.trackData.points[track.trackData.points.length - 1].longitude = f; - num++; - } else if (num == 4) { - var f = parseFloat(token); - if (isNaN(f)) { - f = parseFloat(token.substring(0, 10)); - } - if (isNaN(f)) { - f = 0.0; - } - track.trackData.points[track.trackData.points.length - 1].course = f; - num++; - } else if (num == 5) { - var f = parseFloat(token); - if (isNaN(f)) { - f = parseFloat(token.substring(0, 10)); - } - if (isNaN(f)) { - f = 0.0; - } - track.trackData.points[track.trackData.points.length - 1].speed = f; - num++; - } else if (num == 6) { - track.trackData.points[track.trackData.points.length - 1].d1 = token; - num++; - } else if (num == 7) { - track.trackData.points[track.trackData.points.length - 1].d2 = token; - num++; - } else if (num == 8) { - track.trackData.points[track.trackData.points.length - 1].flag = token; - num++; - } else if (num == 9) { - track.trackData.points[track.trackData.points.length - 1].private = token; - num++; + + switch (num) { + case 0: + currentPoint = { + date: 'dummy', + time: '', + latitude: '', + longitude: '', + course: '', + speed: '', + d1: '', + d2: '', + flag: '', + private: '', + }; + + points.push(currentPoint); + + currentPoint.date = token; + break; + + case 1: + currentPoint.time = token; + break; + + case 2: + currentPoint.latitude = _parseFloat(token); + break; + + case 3: + currentPoint.longitude = _parseFloat(token); + break; + + case 4: + currentPoint.course = _parseFloat(token); + break; + + case 5: + currentPoint.speed = _parseFloat(token); + break; + + case 6: + currentPoint.d1 = token; + break; + + case 7: + currentPoint.d2 = token; + break; + + case 8: + currentPoint.flag = token; + break; + + case 9: + currentPoint.private = token; + break; } + + num++; } } } From 2ff842bd11681559c92251c8e20c1410c0ed7463 Mon Sep 17 00:00:00 2001 From: Paul Bienkowski Date: Wed, 18 Nov 2020 17:15:32 +0100 Subject: [PATCH 07/22] chore: introduce eslint --- package-lock.json | 1417 +++++++++++++++++++++++++++++++++++++++++++++ package.json | 36 +- 2 files changed, 1451 insertions(+), 2 deletions(-) diff --git a/package-lock.json b/package-lock.json index dbb7b16..9245194 100644 --- a/package-lock.json +++ b/package-lock.json @@ -353,6 +353,50 @@ "minimist": "^1.2.0" } }, + "@eslint/eslintrc": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.2.1.tgz", + "integrity": "sha512-XRUeBZ5zBWLYgSANMpThFddrZZkEbGHgUdt5UJjZfnlN9BGCiUBrf+nvbRupSjMvqzwnQN0qwCmOxITt1cfywA==", + "dev": true, + "requires": { + "ajv": "^6.12.4", + "debug": "^4.1.1", + "espree": "^7.3.0", + "globals": "^12.1.0", + "ignore": "^4.0.6", + "import-fresh": "^3.2.1", + "js-yaml": "^3.13.1", + "lodash": "^4.17.19", + "minimatch": "^3.0.4", + "strip-json-comments": "^3.1.1" + }, + "dependencies": { + "debug": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", + "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", + "dev": true, + "requires": { + "ms": "2.1.2" + } + }, + "globals": { + "version": "12.4.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz", + "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==", + "dev": true, + "requires": { + "type-fest": "^0.8.1" + } + }, + "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 + } + } + }, "@hapi/address": { "version": "4.1.0", "resolved": "https://registry.npmjs.org/@hapi/address/-/address-4.1.0.tgz", @@ -814,6 +858,32 @@ } } }, + "@nodelib/fs.scandir": { + "version": "2.1.3", + "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz", + "integrity": "sha512-eGmwYQn3gxo4r7jdQnkrrN6bY478C3P+a/y72IJukF8LjB6ZHeB3c+Ehacj3sYeSmUXGlnA67/PmbM9CVwL7Dw==", + "dev": true, + "requires": { + "@nodelib/fs.stat": "2.0.3", + "run-parallel": "^1.1.9" + } + }, + "@nodelib/fs.stat": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.3.tgz", + "integrity": "sha512-bQBFruR2TAwoevBEd/NWMoAAtNGzTRgdrqnYCc7dhzfoNvqPzLyqlEQnzZ3kVnNrSp25iyxE00/3h2fqGAGArA==", + "dev": true + }, + "@nodelib/fs.walk": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.4.tgz", + "integrity": "sha512-1V9XOY4rDW0rehzbrcqAmHnz8e7SKvX27gh8Gt2WgB0+pdzdiLV83p72kZPU+jvMbS1qU5mauP2iOvO8rhmurQ==", + "dev": true, + "requires": { + "@nodelib/fs.scandir": "2.1.3", + "fastq": "^1.6.0" + } + }, "@postman/form-data": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/@postman/form-data/-/form-data-3.1.0.tgz", @@ -937,6 +1007,18 @@ "@types/istanbul-lib-report": "*" } }, + "@types/json-schema": { + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.6.tgz", + "integrity": "sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw==", + "dev": true + }, + "@types/json5": { + "version": "0.0.29", + "resolved": "https://registry.npmjs.org/@types/json5/-/json5-0.0.29.tgz", + "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=", + "dev": true + }, "@types/node": { "version": "14.14.7", "resolved": "https://registry.npmjs.org/@types/node/-/node-14.14.7.tgz", @@ -970,6 +1052,85 @@ "resolved": "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-15.0.0.tgz", "integrity": "sha512-FA/BWv8t8ZWJ+gEOnLLd8ygxH/2UFbAvgEonyfN6yWGLKc7zVjbpl2Y4CTjid9h2RfgPP6SEt6uHwEOply00yw==" }, + "@typescript-eslint/experimental-utils": { + "version": "4.8.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-4.8.1.tgz", + "integrity": "sha512-WigyLn144R3+lGATXW4nNcDJ9JlTkG8YdBWHkDlN0lC3gUGtDi7Pe3h5GPvFKMcRz8KbZpm9FJV9NTW8CpRHpg==", + "dev": true, + "requires": { + "@types/json-schema": "^7.0.3", + "@typescript-eslint/scope-manager": "4.8.1", + "@typescript-eslint/types": "4.8.1", + "@typescript-eslint/typescript-estree": "4.8.1", + "eslint-scope": "^5.0.0", + "eslint-utils": "^2.0.0" + } + }, + "@typescript-eslint/scope-manager": { + "version": "4.8.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-4.8.1.tgz", + "integrity": "sha512-r0iUOc41KFFbZdPAdCS4K1mXivnSZqXS5D9oW+iykQsRlTbQRfuFRSW20xKDdYiaCoH+SkSLeIF484g3kWzwOQ==", + "dev": true, + "requires": { + "@typescript-eslint/types": "4.8.1", + "@typescript-eslint/visitor-keys": "4.8.1" + } + }, + "@typescript-eslint/types": { + "version": "4.8.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-4.8.1.tgz", + "integrity": "sha512-ave2a18x2Y25q5K05K/U3JQIe2Av4+TNi/2YuzyaXLAsDx6UZkz1boZ7nR/N6Wwae2PpudTZmHFXqu7faXfHmA==", + "dev": true + }, + "@typescript-eslint/typescript-estree": { + "version": "4.8.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-4.8.1.tgz", + "integrity": "sha512-bJ6Fn/6tW2g7WIkCWh3QRlaSU7CdUUK52shx36/J7T5oTQzANvi6raoTsbwGM11+7eBbeem8hCCKbyvAc0X3sQ==", + "dev": true, + "requires": { + "@typescript-eslint/types": "4.8.1", + "@typescript-eslint/visitor-keys": "4.8.1", + "debug": "^4.1.1", + "globby": "^11.0.1", + "is-glob": "^4.0.1", + "lodash": "^4.17.15", + "semver": "^7.3.2", + "tsutils": "^3.17.1" + }, + "dependencies": { + "debug": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", + "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", + "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": "7.3.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", + "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==", + "dev": true + } + } + }, + "@typescript-eslint/visitor-keys": { + "version": "4.8.1", + "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-4.8.1.tgz", + "integrity": "sha512-3nrwXFdEYALQh/zW8rFwP4QltqsanCDz4CwWMPiIZmwlk9GlvBeueEIbq05SEq4ganqM0g9nh02xXgv5XI3PeQ==", + "dev": true, + "requires": { + "@typescript-eslint/types": "4.8.1", + "eslint-visitor-keys": "^2.0.0" + } + }, "abab": { "version": "2.0.5", "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz", @@ -1004,11 +1165,29 @@ "acorn-walk": "^7.1.1" } }, + "acorn-jsx": { + "version": "5.3.1", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.1.tgz", + "integrity": "sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng==", + "dev": true + }, "acorn-walk": { "version": "7.2.0", "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-7.2.0.tgz", "integrity": "sha512-OPdCF6GsMIP+Az+aWfAAOEt2/+iVDKE7oy6lJ098aoe59oAmK76qV6Gw60SbZ8jHuG2wH058GF4pLFbYamYrVA==" }, + "ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, + "requires": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + } + }, "ansi-align": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.0.tgz", @@ -1058,6 +1237,12 @@ } } }, + "ansi-colors": { + "version": "4.1.1", + "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz", + "integrity": "sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA==", + "dev": true + }, "ansi-escapes": { "version": "4.3.1", "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-4.3.1.tgz", @@ -1123,6 +1308,23 @@ "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", "integrity": "sha1-ml9pkFGx5wczKPKgCJaLZOopVdI=" }, + "array-includes": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.1.tgz", + "integrity": "sha512-c2VXaCHl7zPsvpkFsw4nxvFie4fh1ur9bpcgsVkIjqn0H/Xwdg+7fv3n2r/isyS8EBj5b06M9kHyZuIr4El6WQ==", + "dev": true, + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.0", + "is-string": "^1.0.5" + } + }, + "array-union": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", + "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", + "dev": true + }, "array-uniq": { "version": "1.0.3", "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz", @@ -1134,6 +1336,39 @@ "resolved": "https://registry.npmjs.org/array-unique/-/array-unique-0.3.2.tgz", "integrity": "sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=" }, + "array.prototype.flat": { + "version": "1.2.4", + "resolved": "https://registry.npmjs.org/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz", + "integrity": "sha512-4470Xi3GAPAjZqFcljX2xzckv1qeKPizoNkiS0+O4IoPR2ZNpcjE0pkhdihlDouK+x6QOast26B4Q/O9DJnwSg==", + "dev": true, + "requires": { + "call-bind": "^1.0.0", + "define-properties": "^1.1.3", + "es-abstract": "^1.18.0-next.1" + }, + "dependencies": { + "es-abstract": { + "version": "1.18.0-next.1", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz", + "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==", + "dev": true, + "requires": { + "es-to-primitive": "^1.2.1", + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1", + "is-callable": "^1.2.2", + "is-negative-zero": "^2.0.0", + "is-regex": "^1.1.1", + "object-inspect": "^1.8.0", + "object-keys": "^1.1.1", + "object.assign": "^4.1.1", + "string.prototype.trimend": "^1.0.1", + "string.prototype.trimstart": "^1.0.1" + } + } + } + }, "asn1": { "version": "0.2.4", "resolved": "https://registry.npmjs.org/asn1/-/asn1-0.2.4.tgz", @@ -1152,6 +1387,12 @@ "resolved": "https://registry.npmjs.org/assign-symbols/-/assign-symbols-1.0.0.tgz", "integrity": "sha1-WWZ/QfrdTyDMvCu5a41Pf3jsA2c=" }, + "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 + }, "async": { "version": "1.5.2", "resolved": "https://registry.npmjs.org/async/-/async-1.5.2.tgz", @@ -1578,6 +1819,16 @@ } } }, + "call-bind": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.0.tgz", + "integrity": "sha512-AEXsYIyyDY3MCzbwdhzG3Jx1R0J2wetQyUynn6dYHAO+bg8l1k7jwZtRv4ryryFs7EP+NDlikJlVe59jr0cM2w==", + "dev": true, + "requires": { + "function-bind": "^1.1.1", + "get-intrinsic": "^1.0.0" + } + }, "callsites": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", @@ -1797,6 +2048,12 @@ "xdg-basedir": "^4.0.0" } }, + "contains-path": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/contains-path/-/contains-path-0.1.0.tgz", + "integrity": "sha1-/ozxhP9mcLa67wGp1IYaXL7EEgo=", + "dev": true + }, "content-disposition": { "version": "0.5.3", "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz", @@ -1969,6 +2226,15 @@ "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==", "dev": true }, + "define-properties": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz", + "integrity": "sha512-3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ==", + "dev": true, + "requires": { + "object-keys": "^1.0.12" + } + }, "define-property": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/define-property/-/define-property-2.0.2.tgz", @@ -2036,6 +2302,32 @@ "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-26.6.2.tgz", "integrity": "sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q==" }, + "dir-glob": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz", + "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==", + "dev": true, + "requires": { + "path-type": "^4.0.0" + }, + "dependencies": { + "path-type": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", + "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", + "dev": true + } + } + }, + "doctrine": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", + "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", + "dev": true, + "requires": { + "esutils": "^2.0.2" + } + }, "dom-serializer": { "version": "0.2.2", "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.2.2.tgz", @@ -2168,6 +2460,15 @@ "once": "^1.4.0" } }, + "enquirer": { + "version": "2.3.6", + "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz", + "integrity": "sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==", + "dev": true, + "requires": { + "ansi-colors": "^4.1.1" + } + }, "entities": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/entities/-/entities-1.1.2.tgz", @@ -2191,6 +2492,36 @@ "escape-html": "~1.0.3" } }, + "es-abstract": { + "version": "1.17.7", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.7.tgz", + "integrity": "sha512-VBl/gnfcJ7OercKA9MVaegWsBHFjV492syMudcnQZvt/Dw8ezpcOHYZXa/J96O8vx+g4x65YKhxOwDUh63aS5g==", + "dev": true, + "requires": { + "es-to-primitive": "^1.2.1", + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1", + "is-callable": "^1.2.2", + "is-regex": "^1.1.1", + "object-inspect": "^1.8.0", + "object-keys": "^1.1.1", + "object.assign": "^4.1.1", + "string.prototype.trimend": "^1.0.1", + "string.prototype.trimstart": "^1.0.1" + } + }, + "es-to-primitive": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.2.1.tgz", + "integrity": "sha512-QCOllgZJtaUo9miYBcLChTUaHNjJF3PYs1VidD7AwiEj1kYxKeQTctLAezAOH5ZKRH0g2IgPn6KwB4IT8iRpvA==", + "dev": true, + "requires": { + "is-callable": "^1.1.4", + "is-date-object": "^1.0.1", + "is-symbol": "^1.0.2" + } + }, "escape-goat": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/escape-goat/-/escape-goat-2.1.1.tgz", @@ -2219,11 +2550,563 @@ "source-map": "~0.6.1" } }, + "eslint": { + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-7.13.0.tgz", + "integrity": "sha512-uCORMuOO8tUzJmsdRtrvcGq5qposf7Rw0LwkTJkoDbOycVQtQjmnhZSuLQnozLE4TmAzlMVV45eCHmQ1OpDKUQ==", + "dev": true, + "requires": { + "@babel/code-frame": "^7.0.0", + "@eslint/eslintrc": "^0.2.1", + "ajv": "^6.10.0", + "chalk": "^4.0.0", + "cross-spawn": "^7.0.2", + "debug": "^4.0.1", + "doctrine": "^3.0.0", + "enquirer": "^2.3.5", + "eslint-scope": "^5.1.1", + "eslint-utils": "^2.1.0", + "eslint-visitor-keys": "^2.0.0", + "espree": "^7.3.0", + "esquery": "^1.2.0", + "esutils": "^2.0.2", + "file-entry-cache": "^5.0.1", + "functional-red-black-tree": "^1.0.1", + "glob-parent": "^5.0.0", + "globals": "^12.1.0", + "ignore": "^4.0.6", + "import-fresh": "^3.0.0", + "imurmurhash": "^0.1.4", + "is-glob": "^4.0.0", + "js-yaml": "^3.13.1", + "json-stable-stringify-without-jsonify": "^1.0.1", + "levn": "^0.4.1", + "lodash": "^4.17.19", + "minimatch": "^3.0.4", + "natural-compare": "^1.4.0", + "optionator": "^0.9.1", + "progress": "^2.0.0", + "regexpp": "^3.1.0", + "semver": "^7.2.1", + "strip-ansi": "^6.0.0", + "strip-json-comments": "^3.1.0", + "table": "^5.2.3", + "text-table": "^0.2.0", + "v8-compile-cache": "^2.0.3" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz", + "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "cross-spawn": { + "version": "7.0.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" + } + }, + "debug": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.2.0.tgz", + "integrity": "sha512-IX2ncY78vDTjZMFUdmsvIRFY2Cf4FnD0wRs+nQwJU8Lu99/tPFdb0VybiiMTPe3I6rQmwsqQqRBvxU+bZ/I8sg==", + "dev": true, + "requires": { + "ms": "2.1.2" + } + }, + "globals": { + "version": "12.4.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-12.4.0.tgz", + "integrity": "sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg==", + "dev": true, + "requires": { + "type-fest": "^0.8.1" + } + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "levn": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", + "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", + "dev": true, + "requires": { + "prelude-ls": "^1.2.1", + "type-check": "~0.4.0" + } + }, + "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 + }, + "optionator": { + "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.4.1", + "prelude-ls": "^1.2.1", + "type-check": "^0.4.0", + "word-wrap": "^1.2.3" + } + }, + "path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true + }, + "prelude-ls": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", + "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", + "dev": true + }, + "semver": { + "version": "7.3.2", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", + "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==", + "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==", + "dev": true + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + }, + "type-check": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", + "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", + "dev": true, + "requires": { + "prelude-ls": "^1.2.1" + } + }, + "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" + } + } + } + }, + "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" + } + }, + "eslint-config-standard": { + "version": "16.0.2", + "resolved": "https://registry.npmjs.org/eslint-config-standard/-/eslint-config-standard-16.0.2.tgz", + "integrity": "sha512-fx3f1rJDsl9bY7qzyX8SAtP8GBSk6MfXFaTfaGgk12aAYW4gJSyRm7dM790L6cbXv63fvjY4XeSzXnb4WM+SKw==", + "dev": true + }, + "eslint-import-resolver-node": { + "version": "0.3.4", + "resolved": "https://registry.npmjs.org/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz", + "integrity": "sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA==", + "dev": true, + "requires": { + "debug": "^2.6.9", + "resolve": "^1.13.1" + } + }, + "eslint-module-utils": { + "version": "2.6.0", + "resolved": "https://registry.npmjs.org/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz", + "integrity": "sha512-6j9xxegbqe8/kZY8cYpcp0xhbK0EgJlg3g9mib3/miLaExuuwc3n5UEfSnU6hWMbT0FAYVvDbL9RrRgpUeQIvA==", + "dev": true, + "requires": { + "debug": "^2.6.9", + "pkg-dir": "^2.0.0" + }, + "dependencies": { + "find-up": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", + "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", + "dev": true, + "requires": { + "locate-path": "^2.0.0" + } + }, + "locate-path": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", + "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", + "dev": true, + "requires": { + "p-locate": "^2.0.0", + "path-exists": "^3.0.0" + } + }, + "p-limit": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", + "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", + "dev": true, + "requires": { + "p-try": "^1.0.0" + } + }, + "p-locate": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", + "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", + "dev": true, + "requires": { + "p-limit": "^1.1.0" + } + }, + "p-try": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", + "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", + "dev": true + }, + "path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", + "dev": true + }, + "pkg-dir": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz", + "integrity": "sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=", + "dev": true, + "requires": { + "find-up": "^2.1.0" + } + } + } + }, + "eslint-plugin-es": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-es/-/eslint-plugin-es-3.0.1.tgz", + "integrity": "sha512-GUmAsJaN4Fc7Gbtl8uOBlayo2DqhwWvEzykMHSCZHU3XdJ+NSzzZcVhXh3VxX5icqQ+oQdIEawXX8xkR3mIFmQ==", + "dev": true, + "requires": { + "eslint-utils": "^2.0.0", + "regexpp": "^3.0.0" + } + }, + "eslint-plugin-import": { + "version": "2.22.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz", + "integrity": "sha512-8K7JjINHOpH64ozkAhpT3sd+FswIZTfMZTjdx052pnWrgRCVfp8op9tbjpAk3DdUeI/Ba4C8OjdC0r90erHEOw==", + "dev": true, + "requires": { + "array-includes": "^3.1.1", + "array.prototype.flat": "^1.2.3", + "contains-path": "^0.1.0", + "debug": "^2.6.9", + "doctrine": "1.5.0", + "eslint-import-resolver-node": "^0.3.4", + "eslint-module-utils": "^2.6.0", + "has": "^1.0.3", + "minimatch": "^3.0.4", + "object.values": "^1.1.1", + "read-pkg-up": "^2.0.0", + "resolve": "^1.17.0", + "tsconfig-paths": "^3.9.0" + }, + "dependencies": { + "doctrine": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-1.5.0.tgz", + "integrity": "sha1-N53Ocw9hZvds76TmcHoVmwLFpvo=", + "dev": true, + "requires": { + "esutils": "^2.0.2", + "isarray": "^1.0.0" + } + }, + "find-up": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz", + "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=", + "dev": true, + "requires": { + "locate-path": "^2.0.0" + } + }, + "locate-path": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz", + "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=", + "dev": true, + "requires": { + "p-locate": "^2.0.0", + "path-exists": "^3.0.0" + } + }, + "p-limit": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz", + "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==", + "dev": true, + "requires": { + "p-try": "^1.0.0" + } + }, + "p-locate": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz", + "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=", + "dev": true, + "requires": { + "p-limit": "^1.1.0" + } + }, + "p-try": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz", + "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=", + "dev": true + }, + "path-exists": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz", + "integrity": "sha1-zg6+ql94yxiSXqfYENe1mwEP1RU=", + "dev": true + }, + "read-pkg": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-2.0.0.tgz", + "integrity": "sha1-jvHAYjxqbbDcZxPEv6xGMysjaPg=", + "dev": true, + "requires": { + "load-json-file": "^2.0.0", + "normalize-package-data": "^2.3.2", + "path-type": "^2.0.0" + } + }, + "read-pkg-up": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-2.0.0.tgz", + "integrity": "sha1-a3KoBImE4MQeeVEP1en6mbO1Sb4=", + "dev": true, + "requires": { + "find-up": "^2.0.0", + "read-pkg": "^2.0.0" + } + } + } + }, + "eslint-plugin-jest": { + "version": "24.1.3", + "resolved": "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-24.1.3.tgz", + "integrity": "sha512-dNGGjzuEzCE3d5EPZQ/QGtmlMotqnYWD/QpCZ1UuZlrMAdhG5rldh0N0haCvhGnUkSeuORS5VNROwF9Hrgn3Lg==", + "dev": true, + "requires": { + "@typescript-eslint/experimental-utils": "^4.0.1" + } + }, + "eslint-plugin-node": { + "version": "11.1.0", + "resolved": "https://registry.npmjs.org/eslint-plugin-node/-/eslint-plugin-node-11.1.0.tgz", + "integrity": "sha512-oUwtPJ1W0SKD0Tr+wqu92c5xuCeQqB3hSCHasn/ZgjFdA9iDGNkNf2Zi9ztY7X+hNuMib23LNGRm6+uN+KLE3g==", + "dev": true, + "requires": { + "eslint-plugin-es": "^3.0.0", + "eslint-utils": "^2.0.0", + "ignore": "^5.1.1", + "minimatch": "^3.0.4", + "resolve": "^1.10.1", + "semver": "^6.1.0" + }, + "dependencies": { + "ignore": { + "version": "5.1.8", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz", + "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==", + "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 + } + } + }, + "eslint-plugin-prettier": { + "version": "3.1.4", + "resolved": "https://registry.npmjs.org/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.4.tgz", + "integrity": "sha512-jZDa8z76klRqo+TdGDTFJSavwbnWK2ZpqGKNZ+VvweMW516pDUMmQ2koXvxEE4JhzNvTv+radye/bWGBmA6jmg==", + "dev": true, + "requires": { + "prettier-linter-helpers": "^1.0.0" + } + }, + "eslint-plugin-promise": { + "version": "4.2.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-promise/-/eslint-plugin-promise-4.2.1.tgz", + "integrity": "sha512-VoM09vT7bfA7D+upt+FjeBO5eHIJQBUWki1aPvB+vbNiHS3+oGIJGIeyBtKQTME6UPXXy3vV07OL1tHd3ANuDw==", + "dev": true + }, + "eslint-scope": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", + "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", + "dev": true, + "requires": { + "esrecurse": "^4.3.0", + "estraverse": "^4.1.1" + } + }, + "eslint-utils": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-2.1.0.tgz", + "integrity": "sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==", + "dev": true, + "requires": { + "eslint-visitor-keys": "^1.1.0" + }, + "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 + } + } + }, + "eslint-visitor-keys": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz", + "integrity": "sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ==", + "dev": true + }, + "espree": { + "version": "7.3.0", + "resolved": "https://registry.npmjs.org/espree/-/espree-7.3.0.tgz", + "integrity": "sha512-dksIWsvKCixn1yrEXO8UosNSxaDoSYpq9reEjZSbHLpT5hpaCAKTLBwq0RHtLrIr+c0ByiYzWT8KTMRzoRCNlw==", + "dev": true, + "requires": { + "acorn": "^7.4.0", + "acorn-jsx": "^5.2.0", + "eslint-visitor-keys": "^1.3.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 + } + } + }, "esprima": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==" }, + "esquery": { + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.3.1.tgz", + "integrity": "sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ==", + "dev": true, + "requires": { + "estraverse": "^5.1.0" + }, + "dependencies": { + "estraverse": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", + "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==", + "dev": true + } + } + }, + "esrecurse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", + "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", + "dev": true, + "requires": { + "estraverse": "^5.2.0" + }, + "dependencies": { + "estraverse": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.2.0.tgz", + "integrity": "sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==", + "dev": true + } + } + }, "estraverse": { "version": "4.3.0", "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", @@ -2511,6 +3394,32 @@ "integrity": "sha512-RrWKFSSA/aNLP0g3o2WW1Zez7/MnMr7xkiZmoCfAGZmdkDQZ6l2KtuXHN5XjdvpRjDl8+3vf+Rrtl06Z352+Mw==", "dev": true }, + "fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "dev": true + }, + "fast-diff": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.2.0.tgz", + "integrity": "sha512-xJuoT5+L99XlZ8twedaRf6Ax2TgQVxvgZOYoPKqZufmJib0tL2tegPBOZb1pVNgIhlqDlA0eO0c3wBvQcmzx4w==", + "dev": true + }, + "fast-glob": { + "version": "3.2.4", + "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.4.tgz", + "integrity": "sha512-kr/Oo6PX51265qeuCYsyGypiO5uJFgBS0jksyG7FUeCyQzNwYnzrNIMR1NXfkZXsMYXYLRAHgISHBz8gQcxKHQ==", + "dev": true, + "requires": { + "@nodelib/fs.stat": "^2.0.2", + "@nodelib/fs.walk": "^1.2.3", + "glob-parent": "^5.1.0", + "merge2": "^1.3.0", + "micromatch": "^4.0.2", + "picomatch": "^2.2.1" + } + }, "fast-json-stable-stringify": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", @@ -2521,6 +3430,15 @@ "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=" }, + "fastq": { + "version": "1.9.0", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.9.0.tgz", + "integrity": "sha512-i7FVWL8HhVY+CTkwFxkN2mk3h+787ixS5S63eb78diVRc1MCssarHq3W5cj0av7YDSwmaV928RNag+U1etRQ7w==", + "dev": true, + "requires": { + "reusify": "^1.0.4" + } + }, "fb-watchman": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.1.tgz", @@ -2529,6 +3447,15 @@ "bser": "2.1.1" } }, + "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==", + "dev": true, + "requires": { + "flat-cache": "^2.0.1" + } + }, "file-type": { "version": "3.9.0", "resolved": "https://registry.npmjs.org/file-type/-/file-type-3.9.0.tgz", @@ -2580,6 +3507,28 @@ "path-exists": "^4.0.0" } }, + "flat-cache": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-2.0.1.tgz", + "integrity": "sha512-LoQe6yDuUMDzQAEH8sgmh4Md6oZnc/7PjtwjNFSzveXqSHt6ka9fPBuso7IGf9Rz4uqnSnWiFH2B/zj24a5ReA==", + "dev": true, + "requires": { + "flatted": "^2.0.0", + "rimraf": "2.6.3", + "write": "1.0.3" + }, + "dependencies": { + "rimraf": { + "version": "2.6.3", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.6.3.tgz", + "integrity": "sha512-mwqeW5XsA2qAejG46gYdENaxXjx9onRNCfn7L0duuP4hCuTIi/QO7PDK07KJfp1d+izWPrzEJDcSqBa0OZQriA==", + "dev": true, + "requires": { + "glob": "^7.1.3" + } + } + } + }, "flatted": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/flatted/-/flatted-2.0.1.tgz", @@ -2640,6 +3589,12 @@ "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz", "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==" }, + "functional-red-black-tree": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz", + "integrity": "sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=", + "dev": true + }, "gensync": { "version": "1.0.0-beta.2", "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", @@ -2650,11 +3605,28 @@ "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==" }, + "get-intrinsic": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.0.1.tgz", + "integrity": "sha512-ZnWP+AmS1VUaLgTRy47+zKtjTxz+0xMpx3I52i+aalBK1QP19ggLF3Db89KJX7kjfOfP2eoa01qc++GwPgufPg==", + "dev": true, + "requires": { + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1" + } + }, "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==" }, + "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": "4.1.0", "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz", @@ -2712,6 +3684,28 @@ "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==" }, + "globby": { + "version": "11.0.1", + "resolved": "https://registry.npmjs.org/globby/-/globby-11.0.1.tgz", + "integrity": "sha512-iH9RmgwCmUJHi2z5o2l3eTtGBtXek1OYlHrbcxOYugyHLmAsZrPj43OtHThd62Buh/Vv6VyCBD2bdyWcGNQqoQ==", + "dev": true, + "requires": { + "array-union": "^2.1.0", + "dir-glob": "^3.0.1", + "fast-glob": "^3.1.1", + "ignore": "^5.1.4", + "merge2": "^1.3.0", + "slash": "^3.0.0" + }, + "dependencies": { + "ignore": { + "version": "5.1.8", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.1.8.tgz", + "integrity": "sha512-BMpfD7PpiETpBl/A6S498BaIJ6Y/ABT93ETbby2fP00v4EbvPBXWEoaR1UBPKs3iR53pJY7EtZk5KACI57i1Uw==", + "dev": true + } + } + }, "got": { "version": "9.6.0", "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz", @@ -2822,6 +3816,12 @@ "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", "integrity": "sha1-tdRU3CGZriJWmfNGfloH87lVuv0=" }, + "has-symbols": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.1.tgz", + "integrity": "sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==", + "dev": true + }, "has-value": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz", @@ -2991,12 +3991,36 @@ "safer-buffer": ">= 2.1.2 < 3" } }, + "ignore": { + "version": "4.0.6", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz", + "integrity": "sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==", + "dev": true + }, "ignore-by-default": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-1.0.1.tgz", "integrity": "sha1-SMptcvbGo68Aqa1K5odr44ieKwk=", "dev": true }, + "import-fresh": { + "version": "3.2.2", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.2.tgz", + "integrity": "sha512-cTPNrlvJT6twpYy+YmKUKrTSjWFs3bjYjAhCwm+z4EOCubZxAuO+hHpRN64TqjEaYSHs7tJAE0w1CKMGmsG/lw==", + "dev": true, + "requires": { + "parent-module": "^1.0.0", + "resolve-from": "^4.0.0" + }, + "dependencies": { + "resolve-from": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "dev": true + } + } + }, "import-lazy": { "version": "2.1.0", "resolved": "https://registry.npmjs.org/import-lazy/-/import-lazy-2.1.0.tgz", @@ -3140,6 +4164,12 @@ "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==" }, + "is-callable": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.2.tgz", + "integrity": "sha512-dnMqspv5nU3LoewK2N/y7KLtxtakvTuaCsU9FU50/QDmdbHNy/4/JuRtMHqRU22o3q+W89YQndQEeCVwK+3qrA==", + "dev": true + }, "is-ci": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/is-ci/-/is-ci-2.0.0.tgz", @@ -3174,6 +4204,12 @@ } } }, + "is-date-object": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.2.tgz", + "integrity": "sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==", + "dev": true + }, "is-descriptor": { "version": "0.1.6", "resolved": "https://registry.npmjs.org/is-descriptor/-/is-descriptor-0.1.6.tgz", @@ -3237,6 +4273,12 @@ "is-path-inside": "^3.0.1" } }, + "is-negative-zero": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.0.tgz", + "integrity": "sha1-lVOxIbD6wohp2p7UWeIMdUN4hGE=", + "dev": true + }, "is-npm": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-4.0.0.tgz", @@ -3273,11 +4315,35 @@ "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz", "integrity": "sha1-DFLlS8yjkbssSUsh6GJtczbG45c=" }, + "is-regex": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.1.1.tgz", + "integrity": "sha512-1+QkEcxiLlB7VEyFtyBg94e08OAsvq7FUBgApTq/w2ymCLyKJgDPsybBENVtA7XCQEgEXxKPonG+mvYRxh/LIg==", + "dev": true, + "requires": { + "has-symbols": "^1.0.1" + } + }, "is-stream": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=" }, + "is-string": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.0.5.tgz", + "integrity": "sha512-buY6VNRjhQMiF1qWDouloZlQbRhDPCebwxSjxMjxgemYT46YMd2NR0/H+fBhEfWX4A/w9TBJ+ol+okqJKFE6vQ==", + "dev": true + }, + "is-symbol": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.3.tgz", + "integrity": "sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==", + "dev": true, + "requires": { + "has-symbols": "^1.0.1" + } + }, "is-typedarray": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", @@ -4653,6 +5719,18 @@ "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", "integrity": "sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=" }, + "json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true + }, + "json-stable-stringify-without-jsonify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", + "integrity": "sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=", + "dev": true + }, "json-stringify-safe": { "version": "5.0.1", "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", @@ -4786,6 +5864,35 @@ "integrity": "sha1-kVWhgTbYprJhXl8W+aJEira1Duo=", "dev": true }, + "load-json-file": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-2.0.0.tgz", + "integrity": "sha1-eUfkIUmvgNaWy/eXvKq8/h/inKg=", + "dev": true, + "requires": { + "graceful-fs": "^4.1.2", + "parse-json": "^2.2.0", + "pify": "^2.0.0", + "strip-bom": "^3.0.0" + }, + "dependencies": { + "parse-json": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz", + "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=", + "dev": true, + "requires": { + "error-ex": "^1.2.0" + } + }, + "strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", + "dev": true + } + } + }, "locate-path": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", @@ -4941,6 +6048,12 @@ "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==" }, + "merge2": { + "version": "1.4.1", + "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", + "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", + "dev": true + }, "method-override": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/method-override/-/method-override-3.0.0.tgz", @@ -6853,6 +7966,18 @@ "integrity": "sha512-OSuu/pU4ENM9kmREg0BdNrUDIl1heYa4mBZacJc+vVWz4GtAwu7jO8s4AIt2aGRUTqxykpWzI3Oqnsm13tTMDA==", "dev": true }, + "object-inspect": { + "version": "1.8.0", + "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.8.0.tgz", + "integrity": "sha512-jLdtEOB112fORuypAyl/50VRVIBIdVQOSUUGQHzJ4xBSbit81zRarz7GThkEFZy1RceYrWYcPcBFPQwHyAc1gA==", + "dev": true + }, + "object-keys": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", + "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", + "dev": true + }, "object-visit": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz", @@ -6861,6 +7986,18 @@ "isobject": "^3.0.0" } }, + "object.assign": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz", + "integrity": "sha512-ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ==", + "dev": true, + "requires": { + "call-bind": "^1.0.0", + "define-properties": "^1.1.3", + "has-symbols": "^1.0.1", + "object-keys": "^1.1.1" + } + }, "object.pick": { "version": "1.3.0", "resolved": "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz", @@ -6869,6 +8006,18 @@ "isobject": "^3.0.1" } }, + "object.values": { + "version": "1.1.1", + "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.1.1.tgz", + "integrity": "sha512-WTa54g2K8iu0kmS/us18jEmdv1a4Wi//BZ/DTVYEcH0XhLM5NYdpDHja3gt57VrZLcNAO2WGA+KpWsDBaHt6eA==", + "dev": true, + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.17.0-next.1", + "function-bind": "^1.1.1", + "has": "^1.0.3" + } + }, "on-finished": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", @@ -6968,6 +8117,15 @@ } } }, + "parent-module": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", + "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", + "dev": true, + "requires": { + "callsites": "^3.0.0" + } + }, "parse-json": { "version": "5.1.0", "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.1.0.tgz", @@ -7047,6 +8205,15 @@ "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz", "integrity": "sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=" }, + "path-type": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/path-type/-/path-type-2.0.0.tgz", + "integrity": "sha1-8BLMuEFbcJb8LaoQVMPXI4lZTHM=", + "dev": true, + "requires": { + "pify": "^2.0.0" + } + }, "pause": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/pause/-/pause-0.0.1.tgz", @@ -7062,6 +8229,12 @@ "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.2.2.tgz", "integrity": "sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==" }, + "pify": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", + "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=", + "dev": true + }, "pirates": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.1.tgz", @@ -7375,6 +8548,15 @@ "integrity": "sha512-16c7K+x4qVlJg9rEbXl7HEGmQyZlG4R9AgP+oHKRMsMsuk8s+ATStlf1NpDqyBI1HpVyfjLOeMhH2LvuNvV5Vg==", "dev": true }, + "prettier-linter-helpers": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/prettier-linter-helpers/-/prettier-linter-helpers-1.0.0.tgz", + "integrity": "sha512-GbK2cP9nraSSUF9N2XwUwqfzlAFlMNYYl+ShE/V+H8a9uNl/oUqB1w2EL54Jh0OlyRSd8RfWYJ3coVS4TROP2w==", + "dev": true, + "requires": { + "fast-diff": "^1.1.2" + } + }, "pretty-format": { "version": "26.6.2", "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz", @@ -7423,6 +8605,12 @@ "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" }, + "progress": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz", + "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==", + "dev": true + }, "prompts": { "version": "2.4.0", "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.0.tgz", @@ -7591,6 +8779,12 @@ "resolved": "https://registry.npmjs.org/regexp-clone/-/regexp-clone-1.0.0.tgz", "integrity": "sha512-TuAasHQNamyyJ2hb97IuBEif4qBHGjPHBS64sZwytpLEqtBQ1gPJTnOaQ6qmpET16cK14kkjbazl6+p0RRv0yw==" }, + "regexpp": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/regexpp/-/regexpp-3.1.0.tgz", + "integrity": "sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q==", + "dev": true + }, "registry-auth-token": { "version": "4.1.1", "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.1.1.tgz", @@ -7743,6 +8937,12 @@ "resolved": "https://registry.npmjs.org/ret/-/ret-0.1.15.tgz", "integrity": "sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==" }, + "reusify": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", + "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", + "dev": true + }, "rimraf": { "version": "3.0.2", "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", @@ -7756,6 +8956,12 @@ "resolved": "https://registry.npmjs.org/rsvp/-/rsvp-4.8.5.tgz", "integrity": "sha512-nfMOlASu9OnRJo1mbEk2cz0D56a1MBNrJ7orjRZQG10XDyuvwksKbuXNp6qa+kbn839HwjwhBzhFmdsaEAfauA==" }, + "run-parallel": { + "version": "1.1.10", + "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.10.tgz", + "integrity": "sha512-zb/1OuZ6flOlH6tQyMPUrE3x3Ulxjlo9WIVXR4yVYi4H9UXQaeIsPbLn2R3O3vQCnDKkAl2qHiuocKKX4Tz/Sw==", + "dev": true + }, "safe-buffer": { "version": "5.1.2", "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", @@ -8088,6 +9294,25 @@ "resolved": "https://registry.npmjs.org/slash/-/slash-3.0.0.tgz", "integrity": "sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==" }, + "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": { + "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 + } + } + }, "sliced": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/sliced/-/sliced-1.0.1.tgz", @@ -8391,6 +9616,70 @@ "strip-ansi": "^6.0.0" } }, + "string.prototype.trimend": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.2.tgz", + "integrity": "sha512-8oAG/hi14Z4nOVP0z6mdiVZ/wqjDtWSLygMigTzAb+7aPEDTleeFf+WrF+alzecxIRkckkJVn+dTlwzJXORATw==", + "dev": true, + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.18.0-next.1" + }, + "dependencies": { + "es-abstract": { + "version": "1.18.0-next.1", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz", + "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==", + "dev": true, + "requires": { + "es-to-primitive": "^1.2.1", + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1", + "is-callable": "^1.2.2", + "is-negative-zero": "^2.0.0", + "is-regex": "^1.1.1", + "object-inspect": "^1.8.0", + "object-keys": "^1.1.1", + "object.assign": "^4.1.1", + "string.prototype.trimend": "^1.0.1", + "string.prototype.trimstart": "^1.0.1" + } + } + } + }, + "string.prototype.trimstart": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.2.tgz", + "integrity": "sha512-7F6CdBTl5zyu30BJFdzSTlSlLPwODC23Od+iLoVH8X6+3fvDPPuBVVj9iaB1GOsSTSIgVfsfm27R2FGrAPznWg==", + "dev": true, + "requires": { + "define-properties": "^1.1.3", + "es-abstract": "^1.18.0-next.1" + }, + "dependencies": { + "es-abstract": { + "version": "1.18.0-next.1", + "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.18.0-next.1.tgz", + "integrity": "sha512-I4UGspA0wpZXWENrdA0uHbnhte683t3qT/1VFH9aX2dA5PPSf6QW5HHXf5HImaqPmjXaVeVk4RGWnaylmV7uAA==", + "dev": true, + "requires": { + "es-to-primitive": "^1.2.1", + "function-bind": "^1.1.1", + "has": "^1.0.3", + "has-symbols": "^1.0.1", + "is-callable": "^1.2.2", + "is-negative-zero": "^2.0.0", + "is-regex": "^1.1.1", + "object-inspect": "^1.8.0", + "object-keys": "^1.1.1", + "object.assign": "^4.1.1", + "string.prototype.trimend": "^1.0.1", + "string.prototype.trimstart": "^1.0.1" + } + } + } + }, "string_decoder": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", @@ -8471,6 +9760,58 @@ "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.4.tgz", "integrity": "sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==" }, + "table": { + "version": "5.4.6", + "resolved": "https://registry.npmjs.org/table/-/table-5.4.6.tgz", + "integrity": "sha512-wmEc8m4fjnob4gt5riFRtTu/6+4rSe12TpAELNSqHMfF3IqnA+CH37USM6/YR3qRZv7e56kAEAtd6nKZaxe0Ug==", + "dev": true, + "requires": { + "ajv": "^6.10.2", + "lodash": "^4.17.14", + "slice-ansi": "^2.1.0", + "string-width": "^3.0.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 + }, + "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==", + "dev": true, + "requires": { + "emoji-regex": "^7.0.1", + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^5.1.0" + } + }, + "strip-ansi": { + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz", + "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==", + "dev": true, + "requires": { + "ansi-regex": "^4.1.0" + } + } + } + }, "teleport-javascript": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/teleport-javascript/-/teleport-javascript-1.0.0.tgz", @@ -8502,6 +9843,12 @@ "minimatch": "^3.0.4" } }, + "text-table": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", + "integrity": "sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=", + "dev": true + }, "throat": { "version": "5.0.0", "resolved": "https://registry.npmjs.org/throat/-/throat-5.0.0.tgz", @@ -8598,6 +9945,50 @@ "punycode": "^2.1.1" } }, + "tsconfig-paths": { + "version": "3.9.0", + "resolved": "https://registry.npmjs.org/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz", + "integrity": "sha512-dRcuzokWhajtZWkQsDVKbWyY+jgcLC5sqJhg2PSgf4ZkH2aHPvaOY8YWGhmjb68b5qqTfasSsDO9k7RUiEmZAw==", + "dev": true, + "requires": { + "@types/json5": "^0.0.29", + "json5": "^1.0.1", + "minimist": "^1.2.0", + "strip-bom": "^3.0.0" + }, + "dependencies": { + "json5": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.1.tgz", + "integrity": "sha512-aKS4WQjPenRxiQsC93MNfjx+nbF4PAdYzmd/1JIj8HYzqfbu86beTuNgXDzPknWk0n0uARlyewZo4s++ES36Ow==", + "dev": true, + "requires": { + "minimist": "^1.2.0" + } + }, + "strip-bom": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-3.0.0.tgz", + "integrity": "sha1-IzTBjpx1n3vdVv3vfprj1YjmjtM=", + "dev": true + } + } + }, + "tslib": { + "version": "1.14.1", + "resolved": "https://registry.npmjs.org/tslib/-/tslib-1.14.1.tgz", + "integrity": "sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg==", + "dev": true + }, + "tsutils": { + "version": "3.17.1", + "resolved": "https://registry.npmjs.org/tsutils/-/tsutils-3.17.1.tgz", + "integrity": "sha512-kzeQ5B8H3w60nFY2g8cJIuH7JDpsALXySGtwGJ0p2LSjLgay3NdIpqq5SoOBe46bKDW2iq25irHCr8wjomUS2g==", + "dev": true, + "requires": { + "tslib": "^1.8.1" + } + }, "tunnel-agent": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", @@ -8896,6 +10287,12 @@ } } }, + "v8-compile-cache": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz", + "integrity": "sha512-gTpR5XQNKFwOd4clxfnhaqvfqMpqEwr4tOtCyz4MtYZX2JYhfr1JvBFKdS+7K/9rfpZR3VLX+YWBbKoxCgS43Q==", + "dev": true + }, "v8-to-istanbul": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-7.0.0.tgz", @@ -9060,6 +10457,26 @@ "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", diff --git a/package.json b/package.json index 4494b55..f83828e 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "start": "node ./app.js", "dev": "nodemon ./app.js", "mongo:stop": "docker stop realworld-mongo && docker rm realworld-mongo", - "autoformat": "prettier --write logic", + "autoformat": "eslint --fix logic", "test": "jest" }, "repository": { @@ -41,12 +41,22 @@ "underscore": "^1.11.0" }, "devDependencies": { + "eslint": "^7.13.0", + "eslint-config-prettier": "^6.15.0", + "eslint-config-standard": "^16.0.2", + "eslint-plugin-import": "^2.22.1", + "eslint-plugin-jest": "^24.1.3", + "eslint-plugin-node": "^11.1.0", + "eslint-plugin-prettier": "^3.1.4", + "eslint-plugin-promise": "^4.2.1", "newman": "^5.2.0", "nodemon": "^2.0.4", "prettier": "^2.1.2" }, "jest": { - "modulePathIgnorePatterns": ["local"] + "modulePathIgnorePatterns": [ + "local" + ] }, "prettier": { "useTabs": false, @@ -55,5 +65,27 @@ "semi": true, "singleQuote": true, "printWidth": 120 + }, + "eslintConfig": { + "extends": [ + "standard", + "prettier" + ], + "plugins": [ + "jest", + "prettier" + ], + "env": { + "browser": false, + "node": true, + "jest/globals": true + }, + "rules": { + "prettier/prettier": "error", + "standard/array-bracket-even-spacing": 0, + "standard/computed-property-even-spacing": 0, + "standard/object-curly-even-spacing": 0 + }, + "root": true } } From 5d16c4d541ebfcc65e400dc14540ed9921ffae57 Mon Sep 17 00:00:00 2001 From: Paul Bienkowski Date: Wed, 18 Nov 2020 17:24:15 +0100 Subject: [PATCH 08/22] chore: fix dev setup --- docker-compose.yaml | 67 ++++++++++++++++++++++++--------------------- 1 file changed, 36 insertions(+), 31 deletions(-) diff --git a/docker-compose.yaml b/docker-compose.yaml index c07ecc4..ceaa263 100644 --- a/docker-compose.yaml +++ b/docker-compose.yaml @@ -1,35 +1,40 @@ version: '3' services: - mongo: - image: mongo - tty: true - volumes: - - ./local/mongo:/data/db - ports: - - '27017:27017' - restart: on-failure + mongo: + image: mongo + tty: true + volumes: + - ./local/mongo:/data/db + ports: + - '27017:27017' + restart: on-failure - api: - image: obs-api - build: - context: . - dockerfile: ./Dockerfile - volumes: - - ./_helpers:/opt/obsAPI/_helpers - - ./_middleware:/opt/obsAPI/_middleware - - ./accounts:/opt/obsAPI/accounts - - ./config:/opt/obsAPI/config - - ./data:/opt/obsAPI/data - - ./models:/opt/obsAPI/models - - ./public:/opt/obsAPI/public - - ./routes:/opt/obsAPI/routes - - ./app.js:/opt/obsAPI/app.js - environment: - - PORT=3000 - - MONGODB_URL=mongodb://mongo/obsTest - links: - - mongo - ports: - - '3000:3000' - restart: on-failure + api: + image: obs-api + build: + context: . + dockerfile: ./Dockerfile + volumes: + - ./_helpers:/opt/obsAPI/_helpers + - ./_middleware:/opt/obsAPI/_middleware + - ./accounts:/opt/obsAPI/accounts + - ./config:/opt/obsAPI/config + - ./data:/opt/obsAPI/data + - ./models:/opt/obsAPI/models + - ./logic:/opt/obsAPI/logic + - ./public:/opt/obsAPI/public + - ./routes:/opt/obsAPI/routes + - ./app.js:/opt/obsAPI/app.js + environment: + - PORT=3000 + - MONGODB_URL=mongodb://mongo/obsTest + links: + - mongo + ports: + - '3000:3000' + restart: on-failure + command: + - npm + - run + - dev From d8975db15abf745d5ce27b417ee1b230effaa994 Mon Sep 17 00:00:00 2001 From: Paul Bienkowski Date: Wed, 18 Nov 2020 17:24:28 +0100 Subject: [PATCH 09/22] chore: eslint fixes for logic/ folder --- logic/tracks.js | 22 +++++++++++----------- logic/tracks.test.js | 8 ++++---- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/logic/tracks.js b/logic/tracks.js index f74a434..582ba97 100644 --- a/logic/tracks.js +++ b/logic/tracks.js @@ -1,5 +1,5 @@ function _parseFloat(token) { - var f = parseFloat(token); + let f = parseFloat(token); if (isNaN(f)) { f = parseFloat(token.substring(0, 10)); } @@ -10,32 +10,32 @@ function _parseFloat(token) { } module.exports.addPointsToTrack = function addPointsToTrack(track, body) { - var num = 0; - var start = 0; - var end = 0; + let num = 0; + let start = 0; + let end = 0; // reference to the array we will mutate - var points = track.trackData.points; - var currentPoint; + const points = track.trackData.points; + let currentPoint; while (end < body.length) { start = end; - while (body[end] != ';' && body[end] != '$' && end < body.length) { + while (body[end] !== ';' && body[end] !== '$' && end < body.length) { end++; } - if (body[end] == '$') { + if (body[end] === '$') { // $ is replacing \n as newlines are not allowed in json strings num = 0; } if (end < body.length) { - var token = body.substr(start, end - start); + const token = body.substr(start, end - start); end++; if (token.length > 0) { - if (num == 0 && token == 'Date') { + if (num === 0 && token === 'Date') { // we have a header line, ignore it for now, TODO parse it if (end < body.length) { - while (body[end] != ';' && body[end] != '$' && end < body.length) { + while (body[end] !== ';' && body[end] !== '$' && end < body.length) { end++; } start = end; diff --git a/logic/tracks.test.js b/logic/tracks.test.js index 34b9f95..2110e8d 100644 --- a/logic/tracks.test.js +++ b/logic/tracks.test.js @@ -1,7 +1,7 @@ -var { addPointsToTrack } = require('./tracks'); -var TrackInfo = require('./TrackInfo'); +const { addPointsToTrack } = require('./tracks'); +const TrackInfo = require('./TrackInfo'); -var { test1 } = require('./_tracks_testdata'); +const { test1 } = require('./_tracks_testdata'); describe('addPointsToTrack', () => { it('is a function', () => { @@ -11,7 +11,7 @@ describe('addPointsToTrack', () => { it('works on the sample data with an empty track', () => { const trackInfo = new TrackInfo({}, { points: [] }); addPointsToTrack(trackInfo, test1); - var points = trackInfo.trackData.points; + const points = trackInfo.trackData.points; expect(points).toHaveLength(324); expect(points[0]).toEqual({ date: '12.07.2020', From 22f8c46d6ad54c92b495641d0561bc25e3eb9d43 Mon Sep 17 00:00:00 2001 From: Paul Bienkowski Date: Wed, 18 Nov 2020 20:53:35 +0100 Subject: [PATCH 10/22] wip --- logic/_tracks_testdata.js | 357 +++++++++++++++++++- logic/tracks.js | 145 ++++++++- logic/tracks.test.js | 71 +++- package-lock.json | 13 +- package.json | 1 + routes/api/tracks.js | 667 ++++++++++++++++++++------------------ 6 files changed, 927 insertions(+), 327 deletions(-) diff --git a/logic/_tracks_testdata.js b/logic/_tracks_testdata.js index f9364dd..053df70 100644 --- a/logic/_tracks_testdata.js +++ b/logic/_tracks_testdata.js @@ -1,4 +1,353 @@ -module.exports = { - test1: - 'Date;Time;Latitude;Longitude;Course;Speed;Right;Left;Confirmed;insidePrivacyArea;$12.07.2020;09:02:59;0.000000;0.000000;0.000;0.0000;255;255;0;0;$12.07.2020;09:02:59;0.000000;0.000000;0.000;0.0000;255;255;0;0;$12.07.2020;09:03:00;0.000000;0.000000;0.000;0.0000;255;255;0;0;$12.07.2020;09:03:01;48.722205;9.270218;0.000;0.4260;255;255;0;0;$12.07.2020;09:03:02;48.722206;9.270219;0.000;0.5741;255;255;0;0;$12.07.2020;09:03:03;48.722204;9.270221;0.000;0.5371;255;255;0;0;$12.07.2020;09:03:04;48.722198;9.270229;0.000;0.7593;255;255;0;0;$12.07.2020;09:03:05;48.722188;9.270241;0.000;0.5556;255;255;0;0;$12.07.2020;09:03:06;48.722174;9.270259;0.000;0.4815;255;255;0;0;$12.07.2020;09:03:07;48.722158;9.270278;0.000;0.3704;255;255;0;0;$12.07.2020;09:03:08;48.722146;9.270293;0.000;0.5741;255;255;0;0;$12.07.2020;09:03:09;48.722138;9.270305;0.000;1.2594;255;255;0;0;$12.07.2020;09:03:10;48.722129;9.270318;0.000;1.5557;255;255;0;0;$12.07.2020;09:03:11;48.722122;9.270329;0.000;1.5372;255;255;0;0;$12.07.2020;09:03:12;48.722115;9.270339;0.000;0.4630;255;255;0;0;$12.07.2020;09:03:13;48.722107;9.270350;0.000;0.2963;255;255;0;0;$12.07.2020;09:03:14;48.722101;9.270357;0.000;0.2963;255;255;0;0;$12.07.2020;09:03:15;48.722092;9.270367;0.000;0.8149;255;255;0;0;$12.07.2020;09:03:16;48.722084;9.270377;0.000;1.2223;255;255;0;0;$12.07.2020;09:03:17;48.722076;9.270385;0.000;0.0926;255;255;0;0;$12.07.2020;09:03:18;48.722070;9.270391;0.000;1.4816;255;255;0;0;$12.07.2020;09:03:19;48.722070;9.270392;0.000;1.0927;255;255;0;0;$12.07.2020;09:03:20;48.722066;9.270395;0.000;1.6668;255;255;0;0;$12.07.2020;09:03:21;48.722068;9.270391;0.000;2.0742;255;255;0;0;$12.07.2020;09:03:22;48.722064;9.270396;0.000;1.6853;255;255;0;0;$12.07.2020;09:03:23;48.722060;9.270401;0.000;1.0927;255;255;0;0;$12.07.2020;09:03:24;48.722056;9.270406;0.000;0.9445;255;255;0;0;$12.07.2020;09:03:25;48.722052;9.270411;0.000;0.7964;255;255;0;0;$12.07.2020;09:03:26;48.722047;9.270416;0.000;0.6482;255;255;0;0;$12.07.2020;09:03:27;48.722042;9.270419;0.000;1.0556;255;255;0;0;$12.07.2020;09:03:28;48.722031;9.270433;0.000;2.0372;255;255;0;0;$12.07.2020;09:03:29;48.722031;9.270432;0.000;2.4261;255;255;0;0;$12.07.2020;09:03:30;48.722029;9.270433;0.000;0.8704;255;255;0;0;$12.07.2020;09:03:31;48.722029;9.270433;0.000;1.8150;255;255;0;0;$12.07.2020;09:03:32;48.722024;9.270439;0.000;1.2223;255;255;0;0;$12.07.2020;09:03:33;48.722025;9.270439;0.000;0.3889;255;255;0;0;$12.07.2020;09:03:34;48.722022;9.270440;0.000;0.3519;255;255;0;0;$12.07.2020;09:03:35;48.722020;9.270445;0.000;0.9445;255;255;0;0;$12.07.2020;09:03:36;48.722018;9.270447;0.000;0.9260;255;255;0;0;$12.07.2020;09:03:37;48.722020;9.270444;0.000;0.9075;255;255;0;0;$12.07.2020;09:03:38;48.722021;9.270443;0.000;1.9261;255;255;0;0;$12.07.2020;09:03:39;48.722018;9.270447;0.000;0.3334;255;255;0;0;$12.07.2020;09:03:40;48.722020;9.270445;0.000;0.1482;255;255;0;0;$12.07.2020;09:03:41;48.722023;9.270440;0.000;1.2594;255;255;0;0;$12.07.2020;09:03:42;48.722023;9.270442;0.000;0.5000;255;255;0;0;$12.07.2020;09:03:43;48.722025;9.270440;0.000;0.6852;220;255;0;0;$12.07.2020;09:03:44;48.722023;9.270441;0.000;0.8519;199;255;0;0;$12.07.2020;09:03:45;48.722026;9.270438;0.000;1.4075;255;255;0;0;$12.07.2020;09:03:46;48.722029;9.270436;0.000;0.5371;255;255;0;0;$12.07.2020;09:03:47;48.722028;9.270435;0.000;0.8334;97;255;0;0;$12.07.2020;09:03:48;48.722029;9.270435;0.000;0.3704;255;255;0;0;$12.07.2020;09:03:49;48.722029;9.270436;0.000;1.1112;96;255;0;0;$12.07.2020;09:03:50;48.722029;9.270435;0.000;1.8890;255;255;0;0;$12.07.2020;09:03:51;48.722034;9.270429;0.000;1.0186;255;255;0;0;$12.07.2020;09:03:52;48.721942;9.270529;128.450;5.2226;255;255;0;0;$12.07.2020;09:03:53;48.721929;9.270546;128.450;1.3520;255;255;0;0;$12.07.2020;09:03:53;48.721929;9.270546;128.450;1.3520;79;255;0;0;$12.07.2020;09:03:53;48.721929;9.270546;128.450;1.3520;178;255;0;0;$12.07.2020;09:03:53;48.721929;9.270546;128.450;1.3520;89;255;0;0;$12.07.2020;09:03:53;48.721929;9.270546;128.450;1.3520;255;255;0;0;$12.07.2020;09:03:53;48.721929;9.270546;128.450;1.3520;156;255;0;0;$12.07.2020;09:03:53;48.721929;9.270546;128.450;1.3520;255;255;0;0;$12.07.2020;09:03:53;48.721929;9.270546;128.450;1.3520;255;255;0;0;$12.07.2020;09:03:53;48.721929;9.270546;128.450;1.3520;255;255;0;0;$12.07.2020;09:03:53;48.721929;9.270546;128.450;1.3520;255;255;0;0;$12.07.2020;09:03:53;48.721929;9.270546;128.450;1.3520;168;255;0;0;$12.07.2020;09:03:53;48.721929;9.270546;128.450;1.3520;255;255;0;0;$12.07.2020;09:03:53;48.721929;9.270546;128.450;1.3520;255;181;0;0;$12.07.2020;09:03:53;48.721929;9.270546;128.450;1.3520;255;176;0;0;$12.07.2020;09:03:53;48.721929;9.270546;128.450;1.3520;255;186;0;0;$12.07.2020;09:03:53;48.721929;9.270546;128.450;1.3520;255;255;0;0;$12.07.2020;09:04:10;48.721896;9.270602;916.230;0.0556;255;255;0;0;$12.07.2020;09:04:11;48.721894;9.270609;916.230;0.0926;255;192;0;0;$12.07.2020;09:04:12;48.721892;9.270616;916.230;0.0556;255;255;0;0;$12.07.2020;09:04:13;48.721890;9.270623;916.230;0.0370;255;255;0;0;$12.07.2020;09:04:14;48.721888;9.270629;916.230;0.0926;255;255;0;0;$12.07.2020;09:04:15;48.721886;9.270635;916.230;0.0926;255;255;0;0;$12.07.2020;09:04:16;48.721883;9.270640;916.230;0.0556;255;255;0;0;$12.07.2020;09:04:17;48.721881;9.270644;916.230;0.0370;255;255;0;0;$12.07.2020;09:04:18;48.721879;9.270649;916.230;0.1111;255;255;0;0;$12.07.2020;09:04:19;48.721877;9.270653;916.230;0.1296;255;255;0;0;$12.07.2020;09:04:20;48.721876;9.270657;916.230;0.0926;255;255;0;0;$12.07.2020;09:04:21;48.721874;9.270658;916.230;0.3148;255;255;0;0;$12.07.2020;09:04:22;48.721873;9.270659;916.230;0.0370;255;255;0;0;$12.07.2020;09:04:23;48.721872;9.270661;916.230;0.0741;255;255;0;0;$12.07.2020;09:04:24;48.721871;9.270661;916.230;0.0926;255;255;0;0;$12.07.2020;09:04:25;48.721870;9.270660;916.230;0.3334;255;255;0;0;$12.07.2020;09:04:26;48.721869;9.270658;916.230;0.5000;255;255;0;0;$12.07.2020;09:04:27;48.721866;9.270660;916.230;1.6853;255;255;0;0;$12.07.2020;09:04:28;48.721866;9.270659;916.230;0.8704;255;198;0;0;$12.07.2020;09:04:29;48.721867;9.270659;916.230;0.5741;255;196;0;0;$12.07.2020;09:04:30;48.721867;9.270660;916.230;0.3148;255;196;0;0;$12.07.2020;09:04:31;48.721867;9.270659;916.230;0.1111;255;255;0;0;$12.07.2020;09:04:32;48.721866;9.270659;916.230;0.0556;255;199;0;0;$12.07.2020;09:04:33;48.721867;9.270656;916.230;0.1482;255;199;0;0;$12.07.2020;09:04:34;48.721867;9.270654;916.230;0.0370;255;198;0;0;$12.07.2020;09:04:35;48.721867;9.270653;916.230;0.1296;255;198;0;0;$12.07.2020;09:04:36;48.721867;9.270651;916.230;0.1667;255;255;0;0;$12.07.2020;09:04:37;48.721867;9.270650;916.230;0.0741;255;255;0;0;$12.07.2020;09:04:38;48.721868;9.270650;916.230;0.1852;255;255;0;0;$12.07.2020;09:04:39;48.721868;9.270649;916.230;0.1667;255;201;0;0;$12.07.2020;09:04:40;48.721868;9.270647;916.230;0.0926;255;255;0;0;$12.07.2020;09:04:41;48.721869;9.270644;916.230;0.0185;255;255;0;0;$12.07.2020;09:04:42;48.721869;9.270641;916.230;0.0185;255;198;0;0;$12.07.2020;09:04:43;48.721870;9.270638;916.230;0.0926;255;255;0;0;$12.07.2020;09:04:44;48.721870;9.270635;916.230;0.0370;255;199;0;0;$12.07.2020;09:04:45;48.721871;9.270632;916.230;0.1482;255;204;0;0;$12.07.2020;09:04:46;48.721871;9.270630;916.230;0.0185;255;201;0;0;$12.07.2020;09:04:47;48.721873;9.270630;916.230;0.0926;255;255;0;0;$12.07.2020;09:04:48;48.721873;9.270629;916.230;0.0370;255;255;0;0;$12.07.2020;09:04:49;48.721874;9.270628;916.230;0.4074;255;255;0;0;$12.07.2020;09:04:50;48.721875;9.270627;916.230;0.2222;255;255;0;0;$12.07.2020;09:04:51;48.721876;9.270625;916.230;0.1667;255;255;0;0;$12.07.2020;09:04:52;48.721877;9.270623;916.230;0.1111;255;255;0;0;$12.07.2020;09:04:53;48.721877;9.270622;916.230;0.2037;255;255;0;0;$12.07.2020;09:04:54;48.721879;9.270621;916.230;0.3148;255;255;0;0;$12.07.2020;09:04:55;48.721881;9.270618;916.230;0.2408;255;255;0;0;$12.07.2020;09:04:56;48.721883;9.270615;916.230;0.3148;255;255;0;0;$12.07.2020;09:04:57;48.721884;9.270612;916.230;0.2778;255;255;0;0;$12.07.2020;09:04:58;48.721885;9.270609;916.230;0.1296;255;255;0;0;$12.07.2020;09:04:59;48.721886;9.270606;916.230;0.0370;255;255;0;0;$12.07.2020;09:05:00;48.721888;9.270602;916.230;0.0370;255;255;0;0;$12.07.2020;09:05:01;48.721889;9.270598;916.230;0.1111;255;191;0;0;$12.07.2020;09:05:02;48.721890;9.270595;916.230;0.1482;255;193;0;0;$12.07.2020;09:05:03;48.721891;9.270593;916.230;0.0741;255;255;0;0;$12.07.2020;09:05:04;48.721891;9.270591;916.230;0.1667;255;255;0;0;$12.07.2020;09:05:05;48.721891;9.270589;916.230;0.1296;255;255;0;0;$12.07.2020;09:05:06;48.721891;9.270587;916.230;0.3519;255;199;0;0;$12.07.2020;09:05:07;48.721891;9.270586;916.230;0.2222;255;255;0;0;$12.07.2020;09:05:08;48.721891;9.270588;916.230;0.1667;255;255;0;0;$12.07.2020;09:05:09;48.721890;9.270589;916.230;0.1667;255;255;0;0;$12.07.2020;09:05:10;48.721889;9.270589;916.230;0.2222;255;255;0;0;$12.07.2020;09:05:11;48.721888;9.270589;916.230;0.1482;255;255;0;0;$12.07.2020;09:05:12;48.721887;9.270589;916.230;0.1296;255;255;0;0;$12.07.2020;09:05:13;48.721886;9.270590;916.230;0.1667;255;255;0;0;$12.07.2020;09:05:14;48.721885;9.270591;916.230;0.3148;255;255;0;0;$12.07.2020;09:05:15;48.721885;9.270592;916.230;0.2037;255;255;0;0;$12.07.2020;09:05:16;48.721885;9.270596;916.230;0.5556;255;255;0;0;$12.07.2020;09:05:17;48.721885;9.270598;916.230;0.3519;255;255;0;0;$12.07.2020;09:05:18;48.721884;9.270600;916.230;0.0370;255;255;0;0;$12.07.2020;09:05:19;48.721882;9.270600;916.230;0.1667;255;255;0;0;$12.07.2020;09:05:20;48.721881;9.270602;916.230;0.0556;255;255;0;0;$12.07.2020;09:05:21;48.721879;9.270603;916.230;0.0185;255;206;0;0;$12.07.2020;09:05:22;48.721878;9.270605;916.230;0.0556;255;203;0;0;$12.07.2020;09:05:23;48.721876;9.270606;916.230;0.0741;255;255;0;0;$12.07.2020;09:05:24;48.721874;9.270605;916.230;0.0185;255;255;0;0;$12.07.2020;09:05:25;48.721873;9.270605;916.230;0.0370;255;255;0;0;$12.07.2020;09:05:26;48.721872;9.270605;916.230;0.1296;255;209;0;0;$12.07.2020;09:05:27;48.721870;9.270606;916.230;0.0556;255;255;0;0;$12.07.2020;09:05:28;48.721869;9.270608;916.230;0.1111;255;206;0;0;$12.07.2020;09:05:29;48.721868;9.270610;916.230;0.3148;255;209;0;0;$12.07.2020;09:05:30;48.721867;9.270610;916.230;0.2593;255;208;0;0;$12.07.2020;09:05:31;48.721866;9.270611;916.230;0.0556;255;210;0;0;$12.07.2020;09:05:32;48.721866;9.270612;916.230;0.2222;255;255;0;0;$12.07.2020;09:05:32;48.721866;9.270612;916.230;0.2222;255;255;0;0;$12.07.2020;09:05:32;48.721866;9.270612;916.230;0.2222;255;255;0;0;$12.07.2020;09:05:32;48.721866;9.270612;916.230;0.2222;255;255;0;0;$12.07.2020;09:05:32;48.721866;9.270612;916.230;0.2222;255;255;0;0;$12.07.2020;09:05:32;48.721866;9.270612;916.230;0.2222;255;255;0;0;$12.07.2020;09:05:32;48.721866;9.270612;916.230;0.2222;255;255;0;0;$12.07.2020;09:05:32;48.721866;9.270612;916.230;0.2222;255;255;0;0;$12.07.2020;09:05:32;48.721866;9.270612;916.230;0.2222;255;255;0;0;$12.07.2020;09:05:32;48.721866;9.270612;916.230;0.2222;255;255;0;0;$12.07.2020;09:05:32;48.721866;9.270612;916.230;0.2222;255;255;0;0;$12.07.2020;09:05:44;48.721855;9.270602;916.230;0.2222;255;255;0;0;$12.07.2020;09:05:44;48.721855;9.270602;916.230;0.2222;255;255;0;0;$12.07.2020;09:05:46;48.721854;9.270602;916.230;0.1667;255;255;0;0;$12.07.2020;09:05:46;48.721854;9.270602;916.230;0.1667;255;255;0;0;$12.07.2020;09:05:48;48.721852;9.270606;916.230;0.0926;255;255;0;0;$12.07.2020;09:05:49;48.721851;9.270611;916.230;0.1482;255;255;0;0;$12.07.2020;09:05:50;48.721851;9.270615;916.230;0.1852;255;255;0;0;$12.07.2020;09:05:51;48.721851;9.270616;916.230;0.0185;255;255;0;0;$12.07.2020;09:05:52;48.721851;9.270617;916.230;0.0926;255;255;0;0;$12.07.2020;09:05:53;48.721852;9.270617;916.230;0.0185;255;255;0;0;$12.07.2020;09:05:54;48.721853;9.270616;916.230;0.0741;255;255;0;0;$12.07.2020;09:05:55;48.721855;9.270613;916.230;0.0556;255;255;0;0;$12.07.2020;09:05:56;48.721858;9.270609;916.230;0.6482;255;255;0;0;$12.07.2020;09:05:57;48.721860;9.270606;916.230;0.4260;255;255;0;0;$12.07.2020;09:05:58;48.721864;9.270601;916.230;0.6297;255;255;0;0;$12.07.2020;09:05:59;48.721867;9.270595;916.230;0.4260;255;255;0;0;$12.07.2020;09:06:00;48.721872;9.270589;916.230;0.5000;255;255;0;0;$12.07.2020;09:06:01;48.721875;9.270584;916.230;0.2593;255;255;0;0;$12.07.2020;09:06:02;48.721880;9.270578;916.230;0.5186;255;255;0;0;$12.07.2020;09:06:03;48.721883;9.270574;916.230;0.2222;255;255;0;0;$12.07.2020;09:06:04;48.721886;9.270570;916.230;0.1667;255;255;0;0;$12.07.2020;09:06:05;48.721890;9.270565;916.230;0.2408;255;255;0;0;$12.07.2020;09:06:06;48.721893;9.270562;916.230;0.2593;255;255;0;0;$12.07.2020;09:06:07;48.721893;9.270560;916.230;0.0926;255;255;0;0;$12.07.2020;09:06:08;48.721894;9.270559;916.230;0.0741;255;255;0;0;$12.07.2020;09:06:09;48.721894;9.270557;916.230;0.0741;255;255;0;0;$12.07.2020;09:06:07;48.721896;9.270556;916.230;0.2778;255;255;0;0;$12.07.2020;09:06:08;48.721896;9.270556;916.230;0.2408;255;255;0;0;$12.07.2020;09:06:09;48.721895;9.270557;916.230;0.0926;255;255;0;0;$12.07.2020;09:06:10;48.721894;9.270559;916.230;0.1482;255;255;0;0;$12.07.2020;09:06:11;48.721892;9.270560;916.230;0.2037;255;255;0;0;$12.07.2020;09:06:12;48.721891;9.270561;916.230;0.1296;255;255;0;0;$12.07.2020;09:06:13;48.721892;9.270562;916.230;0.1852;255;255;0;0;$12.07.2020;09:06:14;48.721891;9.270564;916.230;0.0741;255;255;0;0;$12.07.2020;09:06:15;48.721889;9.270566;916.230;0.1482;255;255;0;0;$12.07.2020;09:06:16;48.721888;9.270568;916.230;0.0370;255;255;0;0;$12.07.2020;09:06:17;48.721888;9.270570;916.230;0.2037;255;255;0;0;$12.07.2020;09:06:18;48.721888;9.270572;916.230;0.4630;255;255;0;0;$12.07.2020;09:06:19;48.721887;9.270573;916.230;0.4815;255;255;0;0;$12.07.2020;09:06:20;48.721886;9.270574;916.230;0.3334;255;255;0;0;$12.07.2020;09:06:21;48.721885;9.270576;916.230;0.1852;255;255;0;0;$12.07.2020;09:06:22;48.721884;9.270579;916.230;0.0926;255;255;0;0;$12.07.2020;09:06:23;48.721882;9.270581;916.230;0.0741;255;255;0;0;$12.07.2020;09:06:24;48.721881;9.270584;916.230;0.0741;255;255;0;0;$12.07.2020;09:06:25;48.721880;9.270589;916.230;0.2963;255;255;0;0;$12.07.2020;09:06:26;48.721879;9.270596;916.230;0.3519;255;255;0;0;$12.07.2020;09:06:27;48.721878;9.270602;916.230;0.1111;255;255;0;0;$12.07.2020;09:06:28;48.721876;9.270601;916.230;0.0926;255;255;0;0;$12.07.2020;09:06:29;48.721874;9.270603;916.230;0.0926;255;255;0;0;$12.07.2020;09:06:30;48.721873;9.270607;916.230;0.0926;255;255;0;0;$12.07.2020;09:06:31;48.721872;9.270614;916.230;0.2037;255;255;0;0;$12.07.2020;09:06:32;48.721870;9.270613;916.230;0.0370;255;255;0;0;$12.07.2020;09:06:33;48.721869;9.270614;916.230;0.0926;255;255;0;0;$12.07.2020;09:06:34;48.721868;9.270616;916.230;0.1111;255;255;0;0;$12.07.2020;09:06:35;48.721867;9.270617;916.230;0.2593;255;255;0;0;$12.07.2020;09:06:36;48.721867;9.270618;916.230;0.1852;255;255;0;0;$12.07.2020;09:06:37;48.721867;9.270618;916.230;0.1296;255;255;0;0;$12.07.2020;09:06:38;48.721867;9.270616;916.230;0.2963;255;255;0;0;$12.07.2020;09:06:39;48.721867;9.270613;916.230;0.1296;255;255;0;0;$12.07.2020;09:06:40;48.721867;9.270607;916.230;0.0185;255;255;0;0;$12.07.2020;09:06:41;48.721866;9.270601;916.230;0.5186;255;255;0;0;$12.07.2020;09:06:42;48.721866;9.270593;916.230;0.2963;255;255;0;0;$12.07.2020;09:06:43;48.721866;9.270587;916.230;0.0741;255;255;0;0;$12.07.2020;09:06:44;48.721866;9.270581;916.230;0.0370;255;255;0;0;$12.07.2020;09:06:45;48.721866;9.270576;916.230;0.0370;255;255;0;0;$12.07.2020;09:06:46;48.721866;9.270567;916.230;0.1111;255;255;0;0;$12.07.2020;09:06:47;48.721866;9.270558;916.230;0.4074;255;255;0;0;$12.07.2020;09:06:48;48.721866;9.270550;916.230;0.4260;255;255;0;0;$12.07.2020;09:06:49;48.721866;9.270543;916.230;0.0370;255;255;0;0;$12.07.2020;09:06:50;48.721867;9.270537;916.230;0.2778;255;255;0;0;$12.07.2020;09:06:51;48.721867;9.270532;916.230;0.2037;255;255;0;0;$12.07.2020;09:06:52;48.721867;9.270526;916.230;0.3148;255;255;0;0;$12.07.2020;09:06:53;48.721868;9.270522;916.230;0.0741;255;255;0;0;$12.07.2020;09:06:54;48.721868;9.270517;916.230;0.0741;255;255;0;0;$12.07.2020;09:06:55;48.721869;9.270512;916.230;0.2222;255;255;0;0;$12.07.2020;09:06:56;48.721869;9.270506;916.230;0.2408;255;255;0;0;$12.07.2020;09:06:57;48.721869;9.270503;916.230;0.1111;255;255;0;0;$12.07.2020;09:06:58;48.721870;9.270500;916.230;0.0370;255;255;0;0;$12.07.2020;09:06:59;48.721870;9.270497;916.230;0.1296;255;255;0;0;$12.07.2020;09:07:00;48.721871;9.270494;916.230;0.1296;255;255;0;0;$12.07.2020;09:07:01;48.721871;9.270493;916.230;0.1482;255;255;0;0;$12.07.2020;09:07:02;48.721871;9.270492;916.230;0.2037;255;255;0;0;$12.07.2020;09:07:03;48.721872;9.270490;916.230;0.0370;255;255;0;0;$12.07.2020;09:07:04;48.721873;9.270489;916.230;0.6667;255;255;0;0;$12.07.2020;09:07:05;48.721873;9.270487;916.230;0.0370;255;255;0;0;$12.07.2020;09:07:06;48.721873;9.270486;916.230;0.2222;255;255;0;0;$12.07.2020;09:07:07;48.721873;9.270486;916.230;0.2408;255;255;0;0;$12.07.2020;09:07:08;48.721873;9.270485;916.230;0.1852;255;255;0;0;$12.07.2020;09:07:09;48.721873;9.270485;916.230;0.2037;255;255;0;0;$12.07.2020;09:07:10;48.721872;9.270485;916.230;0.1296;255;255;0;0;$12.07.2020;09:07:11;48.721870;9.270486;916.230;0.0370;255;255;0;0;$12.07.2020;09:07:12;48.721869;9.270489;916.230;0.2037;255;255;0;0;$12.07.2020;09:07:13;48.721867;9.270492;916.230;0.3148;255;255;0;0;$12.07.2020;09:07:14;48.721865;9.270494;916.230;0.2037;255;255;0;0;$12.07.2020;09:07:15;48.721863;9.270495;916.230;0.1667;255;255;0;0;$12.07.2020;09:07:16;48.721861;9.270497;916.230;0.0000;255;255;0;0;$12.07.2020;09:07:17;48.721860;9.270496;916.230;0.4074;255;255;0;0;$12.07.2020;09:07:18;48.721859;9.270495;916.230;0.4445;255;255;0;0;$12.07.2020;09:07:19;48.721857;9.270496;916.230;0.3889;255;255;0;0;$12.07.2020;09:07:20;48.721856;9.270496;916.230;0.1667;255;255;0;0;$12.07.2020;09:07:21;48.721854;9.270494;916.230;0.7593;255;255;0;0;$12.07.2020;09:07:22;48.721851;9.270496;916.230;0.0926;255;255;0;0;$12.07.2020;09:07:23;48.721850;9.270497;916.230;0.1667;255;255;0;0;$12.07.2020;09:07:24;48.721848;9.270501;916.230;0.4074;255;255;0;0;$12.07.2020;09:07:25;48.721847;9.270504;916.230;0.4074;255;255;0;0;$12.07.2020;09:07:26;48.721846;9.270505;916.230;0.2037;255;255;0;0;$12.07.2020;09:07:27;48.721844;9.270508;916.230;0.1111;255;255;0;0;$12.07.2020;09:07:28;48.721843;9.270507;916.230;0.4630;255;255;0;0;$12.07.2020;09:07:29;48.721842;9.270509;916.230;0.1111;255;255;0;0;$12.07.2020;09:07:30;48.721841;9.270512;916.230;0.0926;255;255;0;0;$12.07.2020;09:07:31;48.721840;9.270515;916.230;0.0926;255;255;0;0;$12.07.2020;09:07:32;48.721839;9.270517;916.230;0.1482;255;255;0;0;$12.07.2020;09:07:33;48.721838;9.270522;916.230;0.0556;255;255;0;0;$12.07.2020;09:07:34;48.721838;9.270527;916.230;0.3889;255;255;0;0;$12.07.2020;09:07:35;48.721837;9.270530;916.230;0.1482;255;255;0;0;$12.07.2020;09:07:36;48.721836;9.270532;916.230;0.1111;255;255;0;0;$12.07.2020;09:07:37;48.721835;9.270536;916.230;0.6112;255;255;0;0;$12.07.2020;09:07:38;48.721835;9.270541;916.230;1.1668;255;255;0;0;$12.07.2020;09:07:39;48.721835;9.270543;916.230;0.3889;255;255;0;0;$12.07.2020;09:07:40;48.721834;9.270545;916.230;0.5000;255;255;0;0;$12.07.2020;09:07:41;48.721834;9.270544;916.230;0.1482;255;255;0;0;$12.07.2020;09:07:42;48.721834;9.270545;916.230;0.7593;255;255;0;0;$12.07.2020;09:07:43;48.721834;9.270545;916.230;0.8890;255;255;0;0;$12.07.2020;09:07:44;48.721834;9.270543;916.230;0.4260;255;255;0;0;$12.07.2020;09:07:45;48.721834;9.270541;916.230;0.2408;255;255;0;0;$12.07.2020;09:07:46;48.721834;9.270540;916.230;0.3148;255;255;0;0;$12.07.2020;09:07:47;48.721835;9.270538;916.230;0.0741;255;255;0;0;$12.07.2020;09:07:48;48.721835;9.270535;916.230;0.0556;255;255;0;0;$12.07.2020;09:07:49;48.721835;9.270534;916.230;0.8890;255;255;0;0;$12.07.2020;09:07:50;48.721835;9.270534;916.230;0.5926;255;255;0;0;$12.07.2020;09:07:51;48.721835;9.270534;916.230;0.7593;255;255;0;0;$12.07.2020;09:07:52;48.721836;9.270533;916.230;0.2408;255;255;0;0;$12.07.2020;09:07:53;48.721836;9.270531;916.230;0.0741;255;255;0;0;$12.07.2020;09:07:54;48.721836;9.270529;916.230;0.3889;255;255;0;0;$12.07.2020;09:07:55;48.721836;9.270530;916.230;0.2222;255;255;0;0;$12.07.2020;09:07:56;48.721836;9.270530;916.230;0.0185;255;255;0;0;$12.07.2020;09:07:57;48.721837;9.270531;916.230;0.0185;255;255;0;0;$12.07.2020;09:07:58;48.721837;9.270530;916.230;0.1482;255;255;0;0;$12.07.2020;09:07:59;48.721838;9.270526;916.230;0.3519;255;255;0;0;$12.07.2020;09:08:00;48.721838;9.270521;916.230;0.4260;255;255;0;0;$12.07.2020;09:08:01;48.721839;9.270522;916.230;0.5556;255;255;0;0;$12.07.2020;09:08:02;48.721840;9.270524;916.230;0.3519;255;255;0;0;$12.07.2020;09:08:03;48.721842;9.270525;916.230;0.2963;255;255;0;0;$12.07.2020;09:08:04;48.721843;9.270525;916.230;0.1482;255;255;0;0;$12.07.2020;09:08:05;48.721844;9.270524;916.230;0.2222;255;255;0;0;$12.07.2020;09:08:06;48.721846;9.270522;916.230;0.3704;255;255;0;0;$12.07.2020;09:08:07;48.721847;9.270519;916.230;0.1482;255;255;0;0;$12.07.2020;09:08:08;48.721848;9.270516;916.230;0.0926;255;255;0;0;$12.07.2020;09:08:09;48.721849;9.270514;916.230;0.1296;255;255;0;0;$12.07.2020;09:08:10;48.721850;9.270512;916.230;0.1482;255;255;0;0;$12.07.2020;09:08:11;48.721851;9.270513;916.230;0.3334;255;255;0;0;$12.07.2020;09:08:12;48.721851;9.270512;916.230;0.0926;255;255;0;0;$12.07.2020;09:08:13;48.721851;9.270512;916.230;0.2593;255;255;0;0;$12.07.2020;09:08:14;48.721852;9.270511;916.230;0.0926;255;255;0;0;$12.07.2020;09:08:15;48.721853;9.270512;916.230;0.0370;255;255;0;0;$12.07.2020;09:08:16;48.721852;9.270515;916.230;0.5371;255;255;0;0;$12.07.2020;09:08:17;48.721853;9.270517;916.230;0.1482;255;255;0;0;$12.07.2020;09:08:18;48.721854;9.270519;916.230;0.3148;255;255;0;0;$12.07.2020;09:08:19;48.721855;9.270520;916.230;0.2408;255;255;0;0;$12.07.2020;09:08:20;48.721856;9.270523;916.230;0.3704;255;255;0;0;$', -}; +const TEST_ROWS = [ + 'Date;Time;Latitude;Longitude;Course;Speed;Right;Left;Confirmed;insidePrivacyArea;', + '12.07.2020;09:02:59;0.000000;0.000000;0.000;0.0000;255;255;0;0;', + '12.07.2020;09:02:59;0.000000;0.000000;0.000;0.0000;255;255;0;0;', + '12.07.2020;09:03:00;0.000000;0.000000;0.000;0.0000;255;255;0;0;', + '12.07.2020;09:03:01;48.722205;9.270218;0.000;0.4260;255;255;0;0;', + '12.07.2020;09:03:02;48.722206;9.270219;0.000;0.5741;255;255;0;0;', + '12.07.2020;09:03:03;48.722204;9.270221;0.000;0.5371;255;255;0;0;', + '12.07.2020;09:03:04;48.722198;9.270229;0.000;0.7593;255;255;0;0;', + '12.07.2020;09:03:05;48.722188;9.270241;0.000;0.5556;255;255;0;0;', + '12.07.2020;09:03:06;48.722174;9.270259;0.000;0.4815;255;255;0;0;', + '12.07.2020;09:03:07;48.722158;9.270278;0.000;0.3704;255;255;0;0;', + '12.07.2020;09:03:08;48.722146;9.270293;0.000;0.5741;255;255;0;0;', + '12.07.2020;09:03:09;48.722138;9.270305;0.000;1.2594;255;255;0;0;', + '12.07.2020;09:03:10;48.722129;9.270318;0.000;1.5557;255;255;0;0;', + '12.07.2020;09:03:11;48.722122;9.270329;0.000;1.5372;255;255;0;0;', + '12.07.2020;09:03:12;48.722115;9.270339;0.000;0.4630;255;255;0;0;', + '12.07.2020;09:03:13;48.722107;9.270350;0.000;0.2963;255;255;0;0;', + '12.07.2020;09:03:14;48.722101;9.270357;0.000;0.2963;255;255;0;0;', + '12.07.2020;09:03:15;48.722092;9.270367;0.000;0.8149;255;255;0;0;', + '12.07.2020;09:03:16;48.722084;9.270377;0.000;1.2223;255;255;0;0;', + '12.07.2020;09:03:17;48.722076;9.270385;0.000;0.0926;255;255;0;0;', + '12.07.2020;09:03:18;48.722070;9.270391;0.000;1.4816;255;255;0;0;', + '12.07.2020;09:03:19;48.722070;9.270392;0.000;1.0927;255;255;0;0;', + '12.07.2020;09:03:20;48.722066;9.270395;0.000;1.6668;255;255;0;0;', + '12.07.2020;09:03:21;48.722068;9.270391;0.000;2.0742;255;255;0;0;', + '12.07.2020;09:03:22;48.722064;9.270396;0.000;1.6853;255;255;0;0;', + '12.07.2020;09:03:23;48.722060;9.270401;0.000;1.0927;255;255;0;0;', + '12.07.2020;09:03:24;48.722056;9.270406;0.000;0.9445;255;255;0;0;', + '12.07.2020;09:03:25;48.722052;9.270411;0.000;0.7964;255;255;0;0;', + '12.07.2020;09:03:26;48.722047;9.270416;0.000;0.6482;255;255;0;0;', + '12.07.2020;09:03:27;48.722042;9.270419;0.000;1.0556;255;255;0;0;', + '12.07.2020;09:03:28;48.722031;9.270433;0.000;2.0372;255;255;0;0;', + '12.07.2020;09:03:29;48.722031;9.270432;0.000;2.4261;255;255;0;0;', + '12.07.2020;09:03:30;48.722029;9.270433;0.000;0.8704;255;255;0;0;', + '12.07.2020;09:03:31;48.722029;9.270433;0.000;1.8150;255;255;0;0;', + '12.07.2020;09:03:32;48.722024;9.270439;0.000;1.2223;255;255;0;0;', + '12.07.2020;09:03:33;48.722025;9.270439;0.000;0.3889;255;255;0;0;', + '12.07.2020;09:03:34;48.722022;9.270440;0.000;0.3519;255;255;0;0;', + '12.07.2020;09:03:35;48.722020;9.270445;0.000;0.9445;255;255;0;0;', + '12.07.2020;09:03:36;48.722018;9.270447;0.000;0.9260;255;255;0;0;', + '12.07.2020;09:03:37;48.722020;9.270444;0.000;0.9075;255;255;0;0;', + '12.07.2020;09:03:38;48.722021;9.270443;0.000;1.9261;255;255;0;0;', + '12.07.2020;09:03:39;48.722018;9.270447;0.000;0.3334;255;255;0;0;', + '12.07.2020;09:03:40;48.722020;9.270445;0.000;0.1482;255;255;0;0;', + '12.07.2020;09:03:41;48.722023;9.270440;0.000;1.2594;255;255;0;0;', + '12.07.2020;09:03:42;48.722023;9.270442;0.000;0.5000;255;255;0;0;', + '12.07.2020;09:03:43;48.722025;9.270440;0.000;0.6852;220;255;0;0;', + '12.07.2020;09:03:44;48.722023;9.270441;0.000;0.8519;199;255;0;0;', + '12.07.2020;09:03:45;48.722026;9.270438;0.000;1.4075;255;255;0;0;', + '12.07.2020;09:03:46;48.722029;9.270436;0.000;0.5371;255;255;0;0;', + '12.07.2020;09:03:47;48.722028;9.270435;0.000;0.8334;97;255;0;0;', + '12.07.2020;09:03:48;48.722029;9.270435;0.000;0.3704;255;255;0;0;', + '12.07.2020;09:03:49;48.722029;9.270436;0.000;1.1112;96;255;0;0;', + '12.07.2020;09:03:50;48.722029;9.270435;0.000;1.8890;255;255;0;0;', + '12.07.2020;09:03:51;48.722034;9.270429;0.000;1.0186;255;255;0;0;', + '12.07.2020;09:03:52;48.721942;9.270529;128.450;5.2226;255;255;0;0;', + '12.07.2020;09:03:53;48.721929;9.270546;128.450;1.3520;255;255;0;0;', + '12.07.2020;09:03:53;48.721929;9.270546;128.450;1.3520;79;255;0;0;', + '12.07.2020;09:03:53;48.721929;9.270546;128.450;1.3520;178;255;0;0;', + '12.07.2020;09:03:53;48.721929;9.270546;128.450;1.3520;89;255;0;0;', + '12.07.2020;09:03:53;48.721929;9.270546;128.450;1.3520;255;255;0;0;', + '12.07.2020;09:03:53;48.721929;9.270546;128.450;1.3520;156;255;0;0;', + '12.07.2020;09:03:53;48.721929;9.270546;128.450;1.3520;255;255;0;0;', + '12.07.2020;09:03:53;48.721929;9.270546;128.450;1.3520;255;255;0;0;', + '12.07.2020;09:03:53;48.721929;9.270546;128.450;1.3520;255;255;0;0;', + '12.07.2020;09:03:53;48.721929;9.270546;128.450;1.3520;255;255;0;0;', + '12.07.2020;09:03:53;48.721929;9.270546;128.450;1.3520;168;255;0;0;', + '12.07.2020;09:03:53;48.721929;9.270546;128.450;1.3520;255;255;0;0;', + '12.07.2020;09:03:53;48.721929;9.270546;128.450;1.3520;255;181;0;0;', + '12.07.2020;09:03:53;48.721929;9.270546;128.450;1.3520;255;176;0;0;', + '12.07.2020;09:03:53;48.721929;9.270546;128.450;1.3520;255;186;0;0;', + '12.07.2020;09:03:53;48.721929;9.270546;128.450;1.3520;255;255;0;0;', + '12.07.2020;09:04:10;48.721896;9.270602;916.230;0.0556;255;255;0;0;', + '12.07.2020;09:04:11;48.721894;9.270609;916.230;0.0926;255;192;0;0;', + '12.07.2020;09:04:12;48.721892;9.270616;916.230;0.0556;255;255;0;0;', + '12.07.2020;09:04:13;48.721890;9.270623;916.230;0.0370;255;255;0;0;', + '12.07.2020;09:04:14;48.721888;9.270629;916.230;0.0926;255;255;0;0;', + '12.07.2020;09:04:15;48.721886;9.270635;916.230;0.0926;255;255;0;0;', + '12.07.2020;09:04:16;48.721883;9.270640;916.230;0.0556;255;255;0;0;', + '12.07.2020;09:04:17;48.721881;9.270644;916.230;0.0370;255;255;0;0;', + '12.07.2020;09:04:18;48.721879;9.270649;916.230;0.1111;255;255;0;0;', + '12.07.2020;09:04:19;48.721877;9.270653;916.230;0.1296;255;255;0;0;', + '12.07.2020;09:04:20;48.721876;9.270657;916.230;0.0926;255;255;0;0;', + '12.07.2020;09:04:21;48.721874;9.270658;916.230;0.3148;255;255;0;0;', + '12.07.2020;09:04:22;48.721873;9.270659;916.230;0.0370;255;255;0;0;', + '12.07.2020;09:04:23;48.721872;9.270661;916.230;0.0741;255;255;0;0;', + '12.07.2020;09:04:24;48.721871;9.270661;916.230;0.0926;255;255;0;0;', + '12.07.2020;09:04:25;48.721870;9.270660;916.230;0.3334;255;255;0;0;', + '12.07.2020;09:04:26;48.721869;9.270658;916.230;0.5000;255;255;0;0;', + '12.07.2020;09:04:27;48.721866;9.270660;916.230;1.6853;255;255;0;0;', + '12.07.2020;09:04:28;48.721866;9.270659;916.230;0.8704;255;198;0;0;', + '12.07.2020;09:04:29;48.721867;9.270659;916.230;0.5741;255;196;0;0;', + '12.07.2020;09:04:30;48.721867;9.270660;916.230;0.3148;255;196;0;0;', + '12.07.2020;09:04:31;48.721867;9.270659;916.230;0.1111;255;255;0;0;', + '12.07.2020;09:04:32;48.721866;9.270659;916.230;0.0556;255;199;0;0;', + '12.07.2020;09:04:33;48.721867;9.270656;916.230;0.1482;255;199;0;0;', + '12.07.2020;09:04:34;48.721867;9.270654;916.230;0.0370;255;198;0;0;', + '12.07.2020;09:04:35;48.721867;9.270653;916.230;0.1296;255;198;0;0;', + '12.07.2020;09:04:36;48.721867;9.270651;916.230;0.1667;255;255;0;0;', + '12.07.2020;09:04:37;48.721867;9.270650;916.230;0.0741;255;255;0;0;', + '12.07.2020;09:04:38;48.721868;9.270650;916.230;0.1852;255;255;0;0;', + '12.07.2020;09:04:39;48.721868;9.270649;916.230;0.1667;255;201;0;0;', + '12.07.2020;09:04:40;48.721868;9.270647;916.230;0.0926;255;255;0;0;', + '12.07.2020;09:04:41;48.721869;9.270644;916.230;0.0185;255;255;0;0;', + '12.07.2020;09:04:42;48.721869;9.270641;916.230;0.0185;255;198;0;0;', + '12.07.2020;09:04:43;48.721870;9.270638;916.230;0.0926;255;255;0;0;', + '12.07.2020;09:04:44;48.721870;9.270635;916.230;0.0370;255;199;0;0;', + '12.07.2020;09:04:45;48.721871;9.270632;916.230;0.1482;255;204;0;0;', + '12.07.2020;09:04:46;48.721871;9.270630;916.230;0.0185;255;201;0;0;', + '12.07.2020;09:04:47;48.721873;9.270630;916.230;0.0926;255;255;0;0;', + '12.07.2020;09:04:48;48.721873;9.270629;916.230;0.0370;255;255;0;0;', + '12.07.2020;09:04:49;48.721874;9.270628;916.230;0.4074;255;255;0;0;', + '12.07.2020;09:04:50;48.721875;9.270627;916.230;0.2222;255;255;0;0;', + '12.07.2020;09:04:51;48.721876;9.270625;916.230;0.1667;255;255;0;0;', + '12.07.2020;09:04:52;48.721877;9.270623;916.230;0.1111;255;255;0;0;', + '12.07.2020;09:04:53;48.721877;9.270622;916.230;0.2037;255;255;0;0;', + '12.07.2020;09:04:54;48.721879;9.270621;916.230;0.3148;255;255;0;0;', + '12.07.2020;09:04:55;48.721881;9.270618;916.230;0.2408;255;255;0;0;', + '12.07.2020;09:04:56;48.721883;9.270615;916.230;0.3148;255;255;0;0;', + '12.07.2020;09:04:57;48.721884;9.270612;916.230;0.2778;255;255;0;0;', + '12.07.2020;09:04:58;48.721885;9.270609;916.230;0.1296;255;255;0;0;', + '12.07.2020;09:04:59;48.721886;9.270606;916.230;0.0370;255;255;0;0;', + '12.07.2020;09:05:00;48.721888;9.270602;916.230;0.0370;255;255;0;0;', + '12.07.2020;09:05:01;48.721889;9.270598;916.230;0.1111;255;191;0;0;', + '12.07.2020;09:05:02;48.721890;9.270595;916.230;0.1482;255;193;0;0;', + '12.07.2020;09:05:03;48.721891;9.270593;916.230;0.0741;255;255;0;0;', + '12.07.2020;09:05:04;48.721891;9.270591;916.230;0.1667;255;255;0;0;', + '12.07.2020;09:05:05;48.721891;9.270589;916.230;0.1296;255;255;0;0;', + '12.07.2020;09:05:06;48.721891;9.270587;916.230;0.3519;255;199;0;0;', + '12.07.2020;09:05:07;48.721891;9.270586;916.230;0.2222;255;255;0;0;', + '12.07.2020;09:05:08;48.721891;9.270588;916.230;0.1667;255;255;0;0;', + '12.07.2020;09:05:09;48.721890;9.270589;916.230;0.1667;255;255;0;0;', + '12.07.2020;09:05:10;48.721889;9.270589;916.230;0.2222;255;255;0;0;', + '12.07.2020;09:05:11;48.721888;9.270589;916.230;0.1482;255;255;0;0;', + '12.07.2020;09:05:12;48.721887;9.270589;916.230;0.1296;255;255;0;0;', + '12.07.2020;09:05:13;48.721886;9.270590;916.230;0.1667;255;255;0;0;', + '12.07.2020;09:05:14;48.721885;9.270591;916.230;0.3148;255;255;0;0;', + '12.07.2020;09:05:15;48.721885;9.270592;916.230;0.2037;255;255;0;0;', + '12.07.2020;09:05:16;48.721885;9.270596;916.230;0.5556;255;255;0;0;', + '12.07.2020;09:05:17;48.721885;9.270598;916.230;0.3519;255;255;0;0;', + '12.07.2020;09:05:18;48.721884;9.270600;916.230;0.0370;255;255;0;0;', + '12.07.2020;09:05:19;48.721882;9.270600;916.230;0.1667;255;255;0;0;', + '12.07.2020;09:05:20;48.721881;9.270602;916.230;0.0556;255;255;0;0;', + '12.07.2020;09:05:21;48.721879;9.270603;916.230;0.0185;255;206;0;0;', + '12.07.2020;09:05:22;48.721878;9.270605;916.230;0.0556;255;203;0;0;', + '12.07.2020;09:05:23;48.721876;9.270606;916.230;0.0741;255;255;0;0;', + '12.07.2020;09:05:24;48.721874;9.270605;916.230;0.0185;255;255;0;0;', + '12.07.2020;09:05:25;48.721873;9.270605;916.230;0.0370;255;255;0;0;', + '12.07.2020;09:05:26;48.721872;9.270605;916.230;0.1296;255;209;0;0;', + '12.07.2020;09:05:27;48.721870;9.270606;916.230;0.0556;255;255;0;0;', + '12.07.2020;09:05:28;48.721869;9.270608;916.230;0.1111;255;206;0;0;', + '12.07.2020;09:05:29;48.721868;9.270610;916.230;0.3148;255;209;0;0;', + '12.07.2020;09:05:30;48.721867;9.270610;916.230;0.2593;255;208;0;0;', + '12.07.2020;09:05:31;48.721866;9.270611;916.230;0.0556;255;210;0;0;', + '12.07.2020;09:05:32;48.721866;9.270612;916.230;0.2222;255;255;0;0;', + '12.07.2020;09:05:32;48.721866;9.270612;916.230;0.2222;255;255;0;0;', + '12.07.2020;09:05:32;48.721866;9.270612;916.230;0.2222;255;255;0;0;', + '12.07.2020;09:05:32;48.721866;9.270612;916.230;0.2222;255;255;0;0;', + '12.07.2020;09:05:32;48.721866;9.270612;916.230;0.2222;255;255;0;0;', + '12.07.2020;09:05:32;48.721866;9.270612;916.230;0.2222;255;255;0;0;', + '12.07.2020;09:05:32;48.721866;9.270612;916.230;0.2222;255;255;0;0;', + '12.07.2020;09:05:32;48.721866;9.270612;916.230;0.2222;255;255;0;0;', + '12.07.2020;09:05:32;48.721866;9.270612;916.230;0.2222;255;255;0;0;', + '12.07.2020;09:05:32;48.721866;9.270612;916.230;0.2222;255;255;0;0;', + '12.07.2020;09:05:32;48.721866;9.270612;916.230;0.2222;255;255;0;0;', + '12.07.2020;09:05:44;48.721855;9.270602;916.230;0.2222;255;255;0;0;', + '12.07.2020;09:05:44;48.721855;9.270602;916.230;0.2222;255;255;0;0;', + '12.07.2020;09:05:46;48.721854;9.270602;916.230;0.1667;255;255;0;0;', + '12.07.2020;09:05:46;48.721854;9.270602;916.230;0.1667;255;255;0;0;', + '12.07.2020;09:05:48;48.721852;9.270606;916.230;0.0926;255;255;0;0;', + '12.07.2020;09:05:49;48.721851;9.270611;916.230;0.1482;255;255;0;0;', + '12.07.2020;09:05:50;48.721851;9.270615;916.230;0.1852;255;255;0;0;', + '12.07.2020;09:05:51;48.721851;9.270616;916.230;0.0185;255;255;0;0;', + '12.07.2020;09:05:52;48.721851;9.270617;916.230;0.0926;255;255;0;0;', + '12.07.2020;09:05:53;48.721852;9.270617;916.230;0.0185;255;255;0;0;', + '12.07.2020;09:05:54;48.721853;9.270616;916.230;0.0741;255;255;0;0;', + '12.07.2020;09:05:55;48.721855;9.270613;916.230;0.0556;255;255;0;0;', + '12.07.2020;09:05:56;48.721858;9.270609;916.230;0.6482;255;255;0;0;', + '12.07.2020;09:05:57;48.721860;9.270606;916.230;0.4260;255;255;0;0;', + '12.07.2020;09:05:58;48.721864;9.270601;916.230;0.6297;255;255;0;0;', + '12.07.2020;09:05:59;48.721867;9.270595;916.230;0.4260;255;255;0;0;', + '12.07.2020;09:06:00;48.721872;9.270589;916.230;0.5000;255;255;0;0;', + '12.07.2020;09:06:01;48.721875;9.270584;916.230;0.2593;255;255;0;0;', + '12.07.2020;09:06:02;48.721880;9.270578;916.230;0.5186;255;255;0;0;', + '12.07.2020;09:06:03;48.721883;9.270574;916.230;0.2222;255;255;0;0;', + '12.07.2020;09:06:04;48.721886;9.270570;916.230;0.1667;255;255;0;0;', + '12.07.2020;09:06:05;48.721890;9.270565;916.230;0.2408;255;255;0;0;', + '12.07.2020;09:06:06;48.721893;9.270562;916.230;0.2593;255;255;0;0;', + '12.07.2020;09:06:07;48.721893;9.270560;916.230;0.0926;255;255;0;0;', + '12.07.2020;09:06:08;48.721894;9.270559;916.230;0.0741;255;255;0;0;', + '12.07.2020;09:06:09;48.721894;9.270557;916.230;0.0741;255;255;0;0;', + '12.07.2020;09:06:07;48.721896;9.270556;916.230;0.2778;255;255;0;0;', + '12.07.2020;09:06:08;48.721896;9.270556;916.230;0.2408;255;255;0;0;', + '12.07.2020;09:06:09;48.721895;9.270557;916.230;0.0926;255;255;0;0;', + '12.07.2020;09:06:10;48.721894;9.270559;916.230;0.1482;255;255;0;0;', + '12.07.2020;09:06:11;48.721892;9.270560;916.230;0.2037;255;255;0;0;', + '12.07.2020;09:06:12;48.721891;9.270561;916.230;0.1296;255;255;0;0;', + '12.07.2020;09:06:13;48.721892;9.270562;916.230;0.1852;255;255;0;0;', + '12.07.2020;09:06:14;48.721891;9.270564;916.230;0.0741;255;255;0;0;', + '12.07.2020;09:06:15;48.721889;9.270566;916.230;0.1482;255;255;0;0;', + '12.07.2020;09:06:16;48.721888;9.270568;916.230;0.0370;255;255;0;0;', + '12.07.2020;09:06:17;48.721888;9.270570;916.230;0.2037;255;255;0;0;', + '12.07.2020;09:06:18;48.721888;9.270572;916.230;0.4630;255;255;0;0;', + '12.07.2020;09:06:19;48.721887;9.270573;916.230;0.4815;255;255;0;0;', + '12.07.2020;09:06:20;48.721886;9.270574;916.230;0.3334;255;255;0;0;', + '12.07.2020;09:06:21;48.721885;9.270576;916.230;0.1852;255;255;0;0;', + '12.07.2020;09:06:22;48.721884;9.270579;916.230;0.0926;255;255;0;0;', + '12.07.2020;09:06:23;48.721882;9.270581;916.230;0.0741;255;255;0;0;', + '12.07.2020;09:06:24;48.721881;9.270584;916.230;0.0741;255;255;0;0;', + '12.07.2020;09:06:25;48.721880;9.270589;916.230;0.2963;255;255;0;0;', + '12.07.2020;09:06:26;48.721879;9.270596;916.230;0.3519;255;255;0;0;', + '12.07.2020;09:06:27;48.721878;9.270602;916.230;0.1111;255;255;0;0;', + '12.07.2020;09:06:28;48.721876;9.270601;916.230;0.0926;255;255;0;0;', + '12.07.2020;09:06:29;48.721874;9.270603;916.230;0.0926;255;255;0;0;', + '12.07.2020;09:06:30;48.721873;9.270607;916.230;0.0926;255;255;0;0;', + '12.07.2020;09:06:31;48.721872;9.270614;916.230;0.2037;255;255;0;0;', + '12.07.2020;09:06:32;48.721870;9.270613;916.230;0.0370;255;255;0;0;', + '12.07.2020;09:06:33;48.721869;9.270614;916.230;0.0926;255;255;0;0;', + '12.07.2020;09:06:34;48.721868;9.270616;916.230;0.1111;255;255;0;0;', + '12.07.2020;09:06:35;48.721867;9.270617;916.230;0.2593;255;255;0;0;', + '12.07.2020;09:06:36;48.721867;9.270618;916.230;0.1852;255;255;0;0;', + '12.07.2020;09:06:37;48.721867;9.270618;916.230;0.1296;255;255;0;0;', + '12.07.2020;09:06:38;48.721867;9.270616;916.230;0.2963;255;255;0;0;', + '12.07.2020;09:06:39;48.721867;9.270613;916.230;0.1296;255;255;0;0;', + '12.07.2020;09:06:40;48.721867;9.270607;916.230;0.0185;255;255;0;0;', + '12.07.2020;09:06:41;48.721866;9.270601;916.230;0.5186;255;255;0;0;', + '12.07.2020;09:06:42;48.721866;9.270593;916.230;0.2963;255;255;0;0;', + '12.07.2020;09:06:43;48.721866;9.270587;916.230;0.0741;255;255;0;0;', + '12.07.2020;09:06:44;48.721866;9.270581;916.230;0.0370;255;255;0;0;', + '12.07.2020;09:06:45;48.721866;9.270576;916.230;0.0370;255;255;0;0;', + '12.07.2020;09:06:46;48.721866;9.270567;916.230;0.1111;255;255;0;0;', + '12.07.2020;09:06:47;48.721866;9.270558;916.230;0.4074;255;255;0;0;', + '12.07.2020;09:06:48;48.721866;9.270550;916.230;0.4260;255;255;0;0;', + '12.07.2020;09:06:49;48.721866;9.270543;916.230;0.0370;255;255;0;0;', + '12.07.2020;09:06:50;48.721867;9.270537;916.230;0.2778;255;255;0;0;', + '12.07.2020;09:06:51;48.721867;9.270532;916.230;0.2037;255;255;0;0;', + '12.07.2020;09:06:52;48.721867;9.270526;916.230;0.3148;255;255;0;0;', + '12.07.2020;09:06:53;48.721868;9.270522;916.230;0.0741;255;255;0;0;', + '12.07.2020;09:06:54;48.721868;9.270517;916.230;0.0741;255;255;0;0;', + '12.07.2020;09:06:55;48.721869;9.270512;916.230;0.2222;255;255;0;0;', + '12.07.2020;09:06:56;48.721869;9.270506;916.230;0.2408;255;255;0;0;', + '12.07.2020;09:06:57;48.721869;9.270503;916.230;0.1111;255;255;0;0;', + '12.07.2020;09:06:58;48.721870;9.270500;916.230;0.0370;255;255;0;0;', + '12.07.2020;09:06:59;48.721870;9.270497;916.230;0.1296;255;255;0;0;', + '12.07.2020;09:07:00;48.721871;9.270494;916.230;0.1296;255;255;0;0;', + '12.07.2020;09:07:01;48.721871;9.270493;916.230;0.1482;255;255;0;0;', + '12.07.2020;09:07:02;48.721871;9.270492;916.230;0.2037;255;255;0;0;', + '12.07.2020;09:07:03;48.721872;9.270490;916.230;0.0370;255;255;0;0;', + '12.07.2020;09:07:04;48.721873;9.270489;916.230;0.6667;255;255;0;0;', + '12.07.2020;09:07:05;48.721873;9.270487;916.230;0.0370;255;255;0;0;', + '12.07.2020;09:07:06;48.721873;9.270486;916.230;0.2222;255;255;0;0;', + '12.07.2020;09:07:07;48.721873;9.270486;916.230;0.2408;255;255;0;0;', + '12.07.2020;09:07:08;48.721873;9.270485;916.230;0.1852;255;255;0;0;', + '12.07.2020;09:07:09;48.721873;9.270485;916.230;0.2037;255;255;0;0;', + '12.07.2020;09:07:10;48.721872;9.270485;916.230;0.1296;255;255;0;0;', + '12.07.2020;09:07:11;48.721870;9.270486;916.230;0.0370;255;255;0;0;', + '12.07.2020;09:07:12;48.721869;9.270489;916.230;0.2037;255;255;0;0;', + '12.07.2020;09:07:13;48.721867;9.270492;916.230;0.3148;255;255;0;0;', + '12.07.2020;09:07:14;48.721865;9.270494;916.230;0.2037;255;255;0;0;', + '12.07.2020;09:07:15;48.721863;9.270495;916.230;0.1667;255;255;0;0;', + '12.07.2020;09:07:16;48.721861;9.270497;916.230;0.0000;255;255;0;0;', + '12.07.2020;09:07:17;48.721860;9.270496;916.230;0.4074;255;255;0;0;', + '12.07.2020;09:07:18;48.721859;9.270495;916.230;0.4445;255;255;0;0;', + '12.07.2020;09:07:19;48.721857;9.270496;916.230;0.3889;255;255;0;0;', + '12.07.2020;09:07:20;48.721856;9.270496;916.230;0.1667;255;255;0;0;', + '12.07.2020;09:07:21;48.721854;9.270494;916.230;0.7593;255;255;0;0;', + '12.07.2020;09:07:22;48.721851;9.270496;916.230;0.0926;255;255;0;0;', + '12.07.2020;09:07:23;48.721850;9.270497;916.230;0.1667;255;255;0;0;', + '12.07.2020;09:07:24;48.721848;9.270501;916.230;0.4074;255;255;0;0;', + '12.07.2020;09:07:25;48.721847;9.270504;916.230;0.4074;255;255;0;0;', + '12.07.2020;09:07:26;48.721846;9.270505;916.230;0.2037;255;255;0;0;', + '12.07.2020;09:07:27;48.721844;9.270508;916.230;0.1111;255;255;0;0;', + '12.07.2020;09:07:28;48.721843;9.270507;916.230;0.4630;255;255;0;0;', + '12.07.2020;09:07:29;48.721842;9.270509;916.230;0.1111;255;255;0;0;', + '12.07.2020;09:07:30;48.721841;9.270512;916.230;0.0926;255;255;0;0;', + '12.07.2020;09:07:31;48.721840;9.270515;916.230;0.0926;255;255;0;0;', + '12.07.2020;09:07:32;48.721839;9.270517;916.230;0.1482;255;255;0;0;', + '12.07.2020;09:07:33;48.721838;9.270522;916.230;0.0556;255;255;0;0;', + '12.07.2020;09:07:34;48.721838;9.270527;916.230;0.3889;255;255;0;0;', + '12.07.2020;09:07:35;48.721837;9.270530;916.230;0.1482;255;255;0;0;', + '12.07.2020;09:07:36;48.721836;9.270532;916.230;0.1111;255;255;0;0;', + '12.07.2020;09:07:37;48.721835;9.270536;916.230;0.6112;255;255;0;0;', + '12.07.2020;09:07:38;48.721835;9.270541;916.230;1.1668;255;255;0;0;', + '12.07.2020;09:07:39;48.721835;9.270543;916.230;0.3889;255;255;0;0;', + '12.07.2020;09:07:40;48.721834;9.270545;916.230;0.5000;255;255;0;0;', + '12.07.2020;09:07:41;48.721834;9.270544;916.230;0.1482;255;255;0;0;', + '12.07.2020;09:07:42;48.721834;9.270545;916.230;0.7593;255;255;0;0;', + '12.07.2020;09:07:43;48.721834;9.270545;916.230;0.8890;255;255;0;0;', + '12.07.2020;09:07:44;48.721834;9.270543;916.230;0.4260;255;255;0;0;', + '12.07.2020;09:07:45;48.721834;9.270541;916.230;0.2408;255;255;0;0;', + '12.07.2020;09:07:46;48.721834;9.270540;916.230;0.3148;255;255;0;0;', + '12.07.2020;09:07:47;48.721835;9.270538;916.230;0.0741;255;255;0;0;', + '12.07.2020;09:07:48;48.721835;9.270535;916.230;0.0556;255;255;0;0;', + '12.07.2020;09:07:49;48.721835;9.270534;916.230;0.8890;255;255;0;0;', + '12.07.2020;09:07:50;48.721835;9.270534;916.230;0.5926;255;255;0;0;', + '12.07.2020;09:07:51;48.721835;9.270534;916.230;0.7593;255;255;0;0;', + '12.07.2020;09:07:52;48.721836;9.270533;916.230;0.2408;255;255;0;0;', + '12.07.2020;09:07:53;48.721836;9.270531;916.230;0.0741;255;255;0;0;', + '12.07.2020;09:07:54;48.721836;9.270529;916.230;0.3889;255;255;0;0;', + '12.07.2020;09:07:55;48.721836;9.270530;916.230;0.2222;255;255;0;0;', + '12.07.2020;09:07:56;48.721836;9.270530;916.230;0.0185;255;255;0;0;', + '12.07.2020;09:07:57;48.721837;9.270531;916.230;0.0185;255;255;0;0;', + '12.07.2020;09:07:58;48.721837;9.270530;916.230;0.1482;255;255;0;0;', + '12.07.2020;09:07:59;48.721838;9.270526;916.230;0.3519;255;255;0;0;', + '12.07.2020;09:08:00;48.721838;9.270521;916.230;0.4260;255;255;0;0;', + '12.07.2020;09:08:01;48.721839;9.270522;916.230;0.5556;255;255;0;0;', + '12.07.2020;09:08:02;48.721840;9.270524;916.230;0.3519;255;255;0;0;', + '12.07.2020;09:08:03;48.721842;9.270525;916.230;0.2963;255;255;0;0;', + '12.07.2020;09:08:04;48.721843;9.270525;916.230;0.1482;255;255;0;0;', + '12.07.2020;09:08:05;48.721844;9.270524;916.230;0.2222;255;255;0;0;', + '12.07.2020;09:08:06;48.721846;9.270522;916.230;0.3704;255;255;0;0;', + '12.07.2020;09:08:07;48.721847;9.270519;916.230;0.1482;255;255;0;0;', + '12.07.2020;09:08:08;48.721848;9.270516;916.230;0.0926;255;255;0;0;', + '12.07.2020;09:08:09;48.721849;9.270514;916.230;0.1296;255;255;0;0;', + '12.07.2020;09:08:10;48.721850;9.270512;916.230;0.1482;255;255;0;0;', + '12.07.2020;09:08:11;48.721851;9.270513;916.230;0.3334;255;255;0;0;', + '12.07.2020;09:08:12;48.721851;9.270512;916.230;0.0926;255;255;0;0;', + '12.07.2020;09:08:13;48.721851;9.270512;916.230;0.2593;255;255;0;0;', + '12.07.2020;09:08:14;48.721852;9.270511;916.230;0.0926;255;255;0;0;', + '12.07.2020;09:08:15;48.721853;9.270512;916.230;0.0370;255;255;0;0;', + '12.07.2020;09:08:16;48.721852;9.270515;916.230;0.5371;255;255;0;0;', + '12.07.2020;09:08:17;48.721853;9.270517;916.230;0.1482;255;255;0;0;', + '12.07.2020;09:08:18;48.721854;9.270519;916.230;0.3148;255;255;0;0;', + '12.07.2020;09:08:19;48.721855;9.270520;916.230;0.2408;255;255;0;0;', + '12.07.2020;09:08:20;48.721856;9.270523;916.230;0.3704;255;255;0;0;', +]; + +const test1 = TEST_ROWS.join('$'); + +const test2 = `OBSFirmwareVersion=v0.3.999&OBSDataFormat=2&DataPerMeasurement=3&MaximumMeasurementsPerLine=60&OffsetLeft=30&OffsetRight=30&NumberOfDefinedPrivacyAreas=3&PrivacyLevelApplied=AbsolutePrivacy&MaximumValidFlightTimeMicroseconds=18560&DistanceSensorsUsed=HC-SR04/JSN-SR04T&DeviceId=ECEC&OBSUserID=32423432342234 +Date;Time;Millis;Comment;Latitude;Longitude;Altitude;Course;Speed;HDOP;Satellites;BatteryLevel;Left;Right;Confirmed;Marked;Invalid;InsidePrivacyArea;Factor;Measurements;Tms1;Lus1;Rus1;Tms2;Lus2;Rus2;Tms3;Lus3;Rus3;Tms4;Lus4;Rus4;Tms5;Lus5;Rus5;Tms6;Lus6;Rus6;Tms7;Lus7;Rus7;Tms8;Lus8;Rus8;Tms9;Lus9;Rus9;Tms10;Lus10;Rus10;Tms11;Lus11;Rus11;Tms12;Lus12;Rus12;Tms13;Lus13;Rus13;Tms14;Lus14;Rus14;Tms15;Lus15;Rus15;Tms16;Lus16;Rus16;Tms17;Lus17;Rus17;Tms18;Lus18;Rus18;Tms19;Lus19;Rus19;Tms20;Lus20;Rus20;Tms21;Lus21;Rus21;Tms22;Lus22;Rus22;Tms23;Lus23;Rus23;Tms24;Lus24;Rus24;Tms25;Lus25;Rus25;Tms26;Lus26;Rus26;Tms27;Lus27;Rus27;Tms28;Lus28;Rus28;Tms29;Lus29;Rus29;Tms30;Lus30;Rus30;Tms31;Lus31;Rus31;Tms32;Lus32;Rus32;Tms33;Lus33;Rus33;Tms34;Lus34;Rus34;Tms35;Lus35;Rus35;Tms36;Lus36;Rus36;Tms37;Lus37;Rus37;Tms38;Lus38;Rus38;Tms39;Lus39;Rus39;Tms40;Lus40;Rus40;Tms41;Lus41;Rus41;Tms42;Lus42;Rus42;Tms43;Lus43;Rus43;Tms44;Lus44;Rus44;Tms45;Lus45;Rus45;Tms46;Lus46;Rus46;Tms47;Lus47;Rus47;Tms48;Lus48;Rus48;Tms49;Lus49;Rus49;Tms50;Lus50;Rus50;Tms51;Lus51;Rus51;Tms52;Lus52;Rus52;Tms53;Lus53;Rus53;Tms54;Lus54;Rus54;Tms55;Lus55;Rus55;Tms56;Lus56;Rus56;Tms57;Lus57;Rus57;Tms58;Lus58;Rus58;Tms59;Lus59;Rus59;Tms60;Lus60;Rus60 +18.11.2020;16:05:59;1265034;;48.723224;9.094103;495.3;189.86;3.2;1.01;7;3.74;770;;0;0;58;54;0;6231;;16;;;36;6350;;52;;;72;6263;;87;;;107;6828;;122;;;143;6836;;158;;;178;6936;;193;;;213;7094;;228;;;248;6822;;263;;;284;7019;;299;;;319;6942;;334;;;354;7110;;370;;;390;7203;;405;;;425;7758;;440;;;461;7266;;476;;;496;7499;;511;;;531;7328;;546;;;567;7354;;582;;;602;7397;;617;;;637;;;664;;;684;16615;;708;;;728;9161;;745;;;765;10238;;783;;;802;8525;;818;;;839;7756;;854;;;875;7580;;890;;;910;7926;;925;;;945;7624;;960;;;;;;;;;;;;;;;;;;;; +18.11.2020;16:06:00;1266041;DEVELOP: GPSMessages: 2587 GPS crc errors: 0;48.723205;9.0941;495.4;189.86;2.87;1.01;7;3.74;1020;;0;0;58;53;0;8012;;27;;;47;7999;;62;;;83;7660;;98;;;118;7698;;133;;;158;1252;;169;;;194;1146;;204;;;229;1173;;239;;;264;1173;;274;;;300;1147;;310;;;335;7943;;352;;;371;8713;;387;;;407;8005;;423;;;443;8021;;458;;;478;;;505;;;525;8111;;541;;;560;8074;;576;;;596;8254;;612;;;632;8514;;647;;;667;8195;;682;;;703;8094;;718;;;738;8123;;754;;;774;8330;;789;;;810;8966;;826;;;846;9066;;862;;;882;10553;;899;;;920;8345;;935;;;955;9219;;;;;;;;;;;;;;;;;;;;;; +18.11.2020;16:06:01;1267037;DEVELOP: Mem: 45k Buffer: 4k last write time: 58;48.723197;9.094089;495.7;189.86;2.93;1.01;7;3.74;1090;;0;0;58;53;0;8164;;18;;;39;8184;;53;;;74;16305;;98;;;118;8658;;135;;;155;8198;;170;;;190;8133;;205;;;226;8536;;241;;;261;8676;;276;;;296;8516;;314;;;334;8114;;350;;;370;8294;;385;;;405;8751;;422;;;441;8163;;457;;;478;8062;;493;;;513;8093;;528;;;549;8060;;564;;;584;8085;;599;;;619;8071;;634;;;655;8262;;671;;;690;8746;;707;;;726;9116;;742;;;762;;;789;;;808;8121;;825;;;845;8113;;860;;;881;8129;;896;;;916;8096;;932;;;952;10617;;;;;;;;;;;;;;;;;;;;;; +18.11.2020;16:06:02;1268027;;48.723185;9.094076;496.1;189.86;3.02;1.01;7;3.74;980;;0;0;58;55;0;8173;;18;;;37;8535;;53;;;73;8435;;88;;;109;8592;;124;;;144;8012;;159;;;180;8037;;195;;;215;7975;;230;;;250;7970;;265;;;286;7850;;301;;;321;7861;;336;;;356;7826;;371;;;392;8097;;407;;;427;8467;;443;;;463;7763;;478;;;498;7687;;513;;;534;7950;;549;;;569;7806;;584;;;604;8253;;620;;;640;7753;;656;;;676;8188;;692;;;711;7533;;727;;;747;7791;;763;;;783;7460;;798;;;825;9827;;843;;;863;7432;;878;;;904;7646;;919;;;939;7538;;955;;;974;7508;;;;;;;;;;;;;;;; +18.11.2020;16:06:03;1269096;;48.723177;9.094068;496.2;189.86;3;1.01;7;3.74;920;;0;0;58;51;0;7218;;19;;;38;8144;;54;;;74;7463;;89;;;110;7856;;125;;;145;7869;;161;;;181;7422;;196;;;216;7934;;232;;;252;7363;;267;;;293;7297;;307;;;332;8105;;348;;;367;7468;;383;;;403;7213;;418;;;439;7172;;454;;;478;7184;;489;;;514;7312;;528;;;550;7175;;565;;;585;7180;;600;;;620;7013;;635;;;655;7154;;670;;;691;7240;;706;;;726;7075;;741;;;761;7133;;776;;;801;7511;;815;;;836;7639;;851;;;872;8891;;888;;;908;7070;;;;;;;;;;;;;;;;;;;;;;;;;;;; +18.11.2020;16:06:04;1270033;;48.723167;9.094056;496.6;189.86;3.19;1.01;7;3.74;870;;0;0;58;53;0;7617;;19;;;39;6812;;55;;;80;1173;;90;;;116;8173;;133;;;152;7431;;168;;;188;7197;;203;;;223;6984;;238;;;259;7218;;274;;;294;6881;;309;;;329;7111;;344;;;365;7500;;380;;;400;7462;;415;;;435;7094;;450;;;471;6820;;486;;;506;7147;;521;;;541;9156;;558;;;578;6961;;594;;;614;;;641;;;660;7176;;676;;;696;7177;;712;;;732;7199;;747;;;767;7218;;782;;;802;7360;;817;;;838;;;865;;;884;;;904;;;924;;;943;;;962;7252;;;;;;;;;;;;;;;;;;;;;; +18.11.2020;16:06:05;1271032;;48.723153;9.094046;496.5;189.86;3.48;1.01;7;3.74;940;;0;0;58;54;0;7295;;14;;;35;7183;;50;;;71;7283;;85;;;106;8957;;122;;;142;8178;;158;;;178;7814;;194;;;213;7495;;229;;;249;7713;;265;;;285;7305;;300;;;320;7654;;335;;;356;7687;;371;;;391;7634;;406;;;426;7167;;441;;;461;;;488;;;508;7245;;524;;;544;7283;;559;;;580;7150;;595;;;615;7194;;630;;;650;7410;;665;;;686;7670;;702;;;721;7421;;737;;;757;7588;;772;;;792;7452;;809;;;828;8162;;844;;;865;9078;;881;;;901;7563;;917;;;936;7775;;952;;;;;;;;;;;;;;;;;;;; +18.11.2020;16:06:06;1272031;;48.723146;9.094036;496.5;189.86;2.44;1.01;7;3.74;1000;;0;0;58;54;0;8193;;18;;;39;7629;;54;;;74;;;102;;;121;7778;;137;;;157;7773;;172;;;193;7922;;208;;;228;7706;;243;;;263;8881;;280;;;299;7776;;315;;;334;7797;;350;;;370;8683;;386;;;406;7863;;422;;;441;7901;;457;;;477;7747;;492;;;513;8246;;529;;;549;7756;;564;;;585;7667;;600;;;620;7657;;635;;;655;;;682;;;702;8193;;719;;;738;7751;;754;;;774;7731;;789;;;809;8109;;825;;;845;7623;;860;;;880;7883;;895;;;916;7579;;931;;;951;7514;;966;;;;;;;;;;;;;;;;;;;; +18.11.2020;16:06:07;1273044;;48.723134;9.094026;496.7;189.86;3.44;1.01;7;3.74;990;;0;0;58;53;0;7543;;15;;;37;7535;;52;;;72;9628;;90;;;109;8166;;125;;;146;7469;;161;;;181;7923;;197;;;216;7651;;232;;;252;7594;;267;;;288;7796;;303;;;323;7960;;338;;;359;7862;;373;;;394;7633;;409;;;429;7926;;444;;;465;7661;;479;;;500;7546;;515;;;535;7522;;550;;;570;8461;;587;;;606;7520;;622;;;643;;;668;;;688;7495;;704;;;723;7672;;739;;;759;7964;;774;;;795;8725;;811;;;831;7366;;847;;;867;7586;;882;;;902;8634;;919;;;938;;;;;;;;;;;;;;;;;;;;;;; +18.11.2020;16:06:08;1274030;;48.723126;9.094013;496.7;230.11;3.54;1.01;7;3.74;850;;0;0;58;53;0;7452;;29;;;49;7446;;65;;;91;1147;;102;;;127;7517;;143;;;163;7411;;178;;;204;1148;;214;;;240;7282;;256;;;281;1201;;291;;;316;1144;;326;;;351;1173;;362;;;386;6718;;401;;;422;7303;;437;;;461;7621;;476;;;497;7557;;511;;;532;7451;;547;;;567;7658;;583;;;603;7534;;618;;;638;7306;;653;;;673;7222;;688;;;709;7169;;724;;;744;7115;;759;;;779;7277;;794;;;815;;;841;;;861;;;881;;;900;7403;;916;;;936;7356;;951;;;972;7030;;;;;;;;;;;;;;;;;;;;;; +18.11.2020;16:06:09;1275038;;48.723121;9.093994;496.9;237.39;3.33;1.01;7;3.74;730;;0;0;58;54;0;7327;;16;;;36;6876;;52;;;72;6953;;87;;;107;7261;;122;;;142;6702;;158;;;178;7286;;193;;;213;6605;;228;;;249;7168;;264;;;284;6641;;299;;;324;7059;;339;;;359;7568;;374;;;394;6476;;409;;;430;6589;;445;;;470;1174;;480;;;505;1173;;515;;;541;1175;;551;;;576;1149;;586;;;611;6222;;626;;;647;6722;;661;;;687;5939;;700;;;723;5989;;735;;;760;6144;;773;;;795;6019;;808;;;830;6306;;844;;;866;6169;;879;;;901;6288;;914;;;936;9882;;954;;;;;;;;;;;;;;;;;;;; +18.11.2020;16:06:10;1276038;;48.723117;9.093979;497.4;247.62;2.96;1.01;7;3.74;7;69;0;;0;0;58;52;0;;;30;;;50;;;69;;;89;;;109;;6187;124;9730;;144;;6203;160;14558;;182;;6178;195;;;222;;6233;235;;;257;;6323;275;;;295;;6379;311;;;331;;6371;346;8588;;366;;6330;381;2150;;401;;6275;417;1200;;437;;6184;461;;;488;;6033;505;;;525;;5943;543;2550;;561;;5872;579;2563;;596;;5844;614;1225;;631;;5835;650;1173;;667;;5799;685;2243;;702;;5804;720;2275;;737;;5798;759;;;785;;5854;805;;;825;;5984;840;;;860;;5979;875;;;895;;6027;911;7850;;931;;6001;946;13531;;969;;5957;;;;;;;;;;;;;;;;;;;;;;;; +18.11.2020;16:06:11;1277041;;48.723117;9.093965;497.5;247.62;2.74;1.01;7;3.74;143;72;0;;0;0;58;48;0;;;30;;5966;43;;;65;;5940;78;12209;;101;;5923;113;;;140;;7918;155;18175;;182;;6159;199;;;226;;6047;239;;;261;;6283;274;;;297;;;328;;;348;;6015;364;;;384;;;418;1174;;428;;6166;453;;;480;;6265;498;;;518;;6241;536;9449;;553;;6311;571;17498;;597;;6394;611;;;638;;6380;652;;;673;;6408;687;;;708;;7059;722;7897;;744;;7059;759;10810;;779;;6459;794;;;822;;6680;841;15140;;864;;;891;6403;;906;;9053;930;10084;;948;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +18.11.2020;16:06:12;1278045;;48.723109;9.093963;498;247.62;2.17;1.79;7;3.74;143;76;0;;0;0;58;48;0;;;30;;6485;52;;;71;;6321;93;;;113;;6283;128;;;148;;6319;164;10355;;184;;6232;199;17561;;225;;6259;238;;;265;;;292;16478;;317;;;344;8916;;361;;6160;379;;;406;;6242;426;;;445;;6318;461;;;481;;6172;496;;;516;;6271;534;;;554;;6184;571;10174;;590;;6204;607;14878;;630;;6333;643;;;670;;6332;683;;;705;;6231;718;;;740;;6227;753;;;776;;;803;;;822;;6469;844;;;864;;6215;879;;;899;;;927;;;946;;6326;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +18.11.2020;16:06:13;1279029;;48.723109;9.093963;498;247.62;0;1.79;7;3.74;116;79;0;;0;0;58;47;0;;;20;;6783;41;;;61;;6343;81;;;101;;6506;121;11871;;142;;6364;162;16368;;185;;6365;197;;;224;;;250;15312;;274;;6698;295;12786;;315;;6428;330;;;357;;6556;375;17429;;401;;6426;418;16587;;444;;6539;462;;;488;;;515;18278;;542;;6507;556;;;584;;6506;593;;;619;;6774;632;;;654;;6775;668;;;690;;;717;;;737;;;764;;;784;;6708;799;;;819;;6908;840;8503;;856;;;882;1202;;893;;6729;917;13601;;939;;;974;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +18.11.2020;16:06:14;1280049;;48.723109;9.093963;498;247.62;0;1.1;7;3.74;121;92;0;;0;0;58;45;0;;;33;;7087;56;;;75;;7170;94;;;113;;7158;129;;;149;;7575;164;;;184;;7233;204;13424;;226;;7616;248;18289;;282;;;315;;;342;;7353;357;;;377;;7521;400;;;419;;7510;435;;;455;;;481;;;500;;7484;516;12940;;537;;;571;8777;;588;;;615;11659;;634;;;660;1174;;670;;;696;;;723;;;742;;;762;;7640;778;;;797;;7980;819;;;839;;8759;855;;;875;;7752;890;11740;;910;;7612;929;12291;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +18.11.2020;16:06:15;1281028;;48.723109;9.093963;498;247.62;0;1.01;7;3.74;133;95;0;;0;0;58;48;0;;;30;;7564;49;12590;;70;;7576;84;;;111;;7584;120;;;146;;7794;161;;;182;;7826;196;;;217;;;244;;;264;;8057;286;;;305;;7525;321;8033;;340;;7657;360;11295;;380;;;407;9480;;423;;;451;12842;;472;;7540;487;16790;;512;;;538;1175;;549;;;574;1175;;584;;7788;609;1175;;619;;;647;;;673;;7354;697;;;716;;7287;738;;;758;;7454;773;;;793;;7286;812;9244;;829;;7388;848;17471;;874;;7246;893;;;919;;;952;8724;;968;;7324;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +18.11.2020;16:06:16;1282037;;48.723109;9.093963;498;247.62;0;1.01;7;3.74;5;89;20;;0;0;58;49;0;;;31;;7290;44;;;66;;7277;80;;;101;;;128;;;148;;7213;164;;;183;;6901;202;10902;;223;;7060;242;2257;;258;;7057;277;2124;;293;;7045;313;1201;;328;;;361;2137;;371;;6931;396;2055;;407;;6910;432;1201;;442;;;468;2042;;478;;6961;503;1201;;513;;;548;12669;;568;;6909;590;;;617;;7063;636;;;656;;7148;672;;;691;;6777;707;;;727;;6903;747;11631;;767;;;793;1174;;803;;7283;828;;;856;;;889;9154;;908;;7489;929;9129;;943;;7430;965;14679;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +`; + +module.exports = { test1, test2 }; diff --git a/logic/tracks.js b/logic/tracks.js index 582ba97..b3a87d5 100644 --- a/logic/tracks.js +++ b/logic/tracks.js @@ -1,3 +1,5 @@ +const csvParse = require('csv-parse/lib/sync'); + function _parseFloat(token) { let f = parseFloat(token); if (isNaN(f)) { @@ -9,13 +11,55 @@ function _parseFloat(token) { return f; } -module.exports.addPointsToTrack = function addPointsToTrack(track, body) { +function addPointsToTrack(trackInfo, body, format = null) { + const detectedFormat = format != null ? format : detectFormat(body); + + let parser; + switch (detectedFormat) { + case 'invalid': + throw new Error('track format cannot be detected'); + + case 1: + parser = parseObsver1; + break; + + case 2: + parser = parseObsver2; + break; + } + + const points = trackInfo.trackData.points; + for (const newPoint of parser(body)) { + points.push(newPoint); + } +} + +function detectFormat(body) { + if (!body.length) { + return 'invalid'; + } + + const firstLinebreakIndex = body.indexOf('\n'); + + if (firstLinebreakIndex === -1) { + return 1; + } + + const firstLine = body.substring(0, firstLinebreakIndex); + + const match = firstLine.match(/(^|&)OBSDataFormat=([\d]+)($|&)/); + if (match) { + return Number(match[2]); + } + + return 'invalid'; +} + +function* parseObsver1(body) { let num = 0; let start = 0; let end = 0; - // reference to the array we will mutate - const points = track.trackData.points; let currentPoint; while (end < body.length) { @@ -24,6 +68,9 @@ module.exports.addPointsToTrack = function addPointsToTrack(track, body) { end++; } if (body[end] === '$') { + if (currentPoint) { + yield currentPoint; + } // $ is replacing \n as newlines are not allowed in json strings num = 0; } @@ -46,7 +93,7 @@ module.exports.addPointsToTrack = function addPointsToTrack(track, body) { switch (num) { case 0: currentPoint = { - date: 'dummy', + date: token, time: '', latitude: '', longitude: '', @@ -57,10 +104,6 @@ module.exports.addPointsToTrack = function addPointsToTrack(track, body) { flag: '', private: '', }; - - points.push(currentPoint); - - currentPoint.date = token; break; case 1: @@ -104,4 +147,88 @@ module.exports.addPointsToTrack = function addPointsToTrack(track, body) { } } } -}; + if (currentPoint) { + yield currentPoint; + } +} + +function* parseObsver2(body) { + for (const record of csvParse(body, { + from_line: 2, + trim: true, + columns: true, + skip_empty_lines: true, + delimiter: ';', + encoding: 'utf8', + relax_column_count: true, + cast(value, context) { + if (value === '') { + return null; + } + + let type; + switch (context.column) { + case 'Millis': + case 'Left': + case 'Right': + case 'Confirmed': + case 'Invalid': + case 'InsidePrivacyArea': + case 'Measurements': + case 'Satellites': + type = 'int'; + break; + + case 'Date': + case 'Time': + case 'Comment': + case 'Marked': + type = 'string'; + break; + + case 'Latitude': + case 'Longitude': + case 'Altitude': + case 'Course': + case 'Speed': + case 'HDOP': + case 'BatteryLevel': + case 'Factor': + type = 'float'; + break; + + default: + type = /^(Tms|Lus|Rus)/.test(context.column) ? 'int' : 'string'; + } + + switch (type) { + case 'int': + return parseInt(value); + + case 'float': + return parseFloat(value); + + case 'string': + return value; + } + }, + })) { + // We convert the new format back to the old format for storage here, until + // we upgrade the storage format as well to include all data. But we'll + // have to upgrade the obsApp first. + yield { + date: record.Date, + time: record.Time, + latitude: record.Latitude, + longitude: record.Longitude, + course: record.Course, + speed: record.Speed, + d1: record.Left, + d2: record.Right, + flag: Boolean(record.Confirmed), + private: Boolean(record.InsidePrivacyArea), + }; + } +} + +module.exports = { addPointsToTrack, detectFormat, parseObsver1, parseObsver2 }; diff --git a/logic/tracks.test.js b/logic/tracks.test.js index 2110e8d..5eba701 100644 --- a/logic/tracks.test.js +++ b/logic/tracks.test.js @@ -1,7 +1,7 @@ -const { addPointsToTrack } = require('./tracks'); +const { addPointsToTrack, parseObsver1, detectFormat, parseObsver2 } = require('./tracks'); const TrackInfo = require('./TrackInfo'); -const { test1 } = require('./_tracks_testdata'); +const { test1, test2 } = require('./_tracks_testdata'); describe('addPointsToTrack', () => { it('is a function', () => { @@ -27,3 +27,70 @@ describe('addPointsToTrack', () => { }); }); }); + +describe('parseObsver1', () => { + it('can parse sample data', () => { + const points = Array.from(parseObsver1(test1)); + expect(points).toHaveLength(324); + expect(points[0]).toEqual({ + date: '12.07.2020', + time: '09:02:59', + latitude: 0, + longitude: 0, + course: 0, + speed: 0, + d1: '255', + d2: '255', + flag: '0', + private: '0', + }); + }); +}); + +describe('parseObsver2', () => { + it('can parse sample data', () => { + const points = Array.from(parseObsver2(test2)); + expect(points).toHaveLength(18); + expect(points[0]).toEqual({ + date: '18.11.2020', + time: '16:05:59', + latitude: 48.723224, + longitude: 9.094103, + course: 189.86, + speed: 3.2, + d1: 770, + d2: null, + flag: false, + private: true, + }); + + // this is a non-private, flagged point (i.e. "Confirmed" overtaking) + expect(points[17]).toEqual({ + date: '18.11.2020', + time: '16:06:16', + latitude: 48.723109, + longitude: 9.093963, + course: 247.62, + speed: 0, + d1: 5, + d2: 89, + flag: true, + private: false, + }); + }); +}); + +describe('detectFormat', () => { + it('detects format 1', () => { + expect(detectFormat(test1)).toBe(1); + }); + + it('detects format 2', () => { + expect(detectFormat(test2)).toBe(2); + }); + + it('detects invalid format', () => { + expect(detectFormat('foobar\nbaz')).toBe('invalid'); + expect(detectFormat('')).toBe('invalid'); + }); +}); diff --git a/package-lock.json b/package-lock.json index 9245194..f0e4b6d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2143,10 +2143,9 @@ } }, "csv-parse": { - "version": "4.12.0", - "resolved": "https://registry.npmjs.org/csv-parse/-/csv-parse-4.12.0.tgz", - "integrity": "sha512-wPQl3H79vWLPI8cgKFcQXl0NBgYYEqVnT1i6/So7OjMpsI540oD7p93r3w6fDSyPvwkTepG05F69/7AViX2lXg==", - "dev": true + "version": "4.14.1", + "resolved": "https://registry.npmjs.org/csv-parse/-/csv-parse-4.14.1.tgz", + "integrity": "sha512-4wmcO7QbWtDAncGFaBwlWFPhEN4Akr64IbM4zvDwEOFekI8blLc04Nw7XjQjtSNy+3AUAgBgtUa9nWo5Cq89Xg==" }, "dashdash": { "version": "1.14.1", @@ -6347,6 +6346,12 @@ "integrity": "sha512-TR2mEZFVOj2pLStYxLht7TyfuRzaydfpxr3k9RpHIzMgw7A64dzsdqCxH1WJyQdoe8T10nDXd9wnEigmiuHIZw==", "dev": true }, + "csv-parse": { + "version": "4.12.0", + "resolved": "https://registry.npmjs.org/csv-parse/-/csv-parse-4.12.0.tgz", + "integrity": "sha512-wPQl3H79vWLPI8cgKFcQXl0NBgYYEqVnT1i6/So7OjMpsI540oD7p93r3w6fDSyPvwkTepG05F69/7AViX2lXg==", + "dev": true + }, "semver": { "version": "7.3.2", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz", diff --git a/package.json b/package.json index f83828e..7e38eaa 100644 --- a/package.json +++ b/package.json @@ -19,6 +19,7 @@ "dependencies": { "body-parser": "1.19.0", "cors": "2.8.5", + "csv-parse": "^4.14.1", "ejs": "^3.1.5", "errorhandler": "1.5.1", "express": "4.17.1", diff --git a/routes/api/tracks.js b/routes/api/tracks.js index 2ba8300..019d279 100644 --- a/routes/api/tracks.js +++ b/routes/api/tracks.js @@ -1,328 +1,351 @@ -var router = require('express').Router(); -var mongoose = require('mongoose'); -var TrackData = mongoose.model('TrackData'); -var Track = mongoose.model('Track'); -var Comment = mongoose.model('Comment'); -var User = mongoose.model('User'); -var auth = require('../auth'); -var currentTracks = new Map(); -var TrackInfo = require('../../logic/TrackInfo'); -var {addPointsToTrack} = require('../../logic/tracks'); +const router = require('express').Router(); +const mongoose = require('mongoose'); +const TrackData = mongoose.model('TrackData'); +const Track = mongoose.model('Track'); +const Comment = mongoose.model('Comment'); +const User = mongoose.model('User'); +const auth = require('../auth'); +const currentTracks = new Map(); +const TrackInfo = require('../../logic/TrackInfo'); +const { addPointsToTrack } = require('../../logic/tracks'); // Preload track objects on routes with ':track' -router.param('track', function(req, res, next, slug) { - Track.findOne({ slug: slug}) +router.param('track', function (req, res, next, slug) { + Track.findOne({ slug: slug }) .populate('author') .then(function (track) { - if (!track) { return res.sendStatus(404); } + if (!track) { + return res.sendStatus(404); + } req.track = track; return next(); - }).catch(next); + }) + .catch(next); }); -router.param('comment', function(req, res, next, id) { - Comment.findById(id).then(function(comment){ - if(!comment) { return res.sendStatus(404); } +router.param('comment', function (req, res, next, id) { + Comment.findById(id) + .then(function (comment) { + if (!comment) { + return res.sendStatus(404); + } - req.comment = comment; + req.comment = comment; - return next(); - }).catch(next); + return next(); + }) + .catch(next); }); -router.get('/', auth.optional, function(req, res, next) { - var query = {}; - var limit = 20; - var offset = 0; +router.get('/', auth.optional, function (req, res, next) { + const query = {}; + let limit = 20; + let offset = 0; - if(typeof req.query.limit !== 'undefined'){ + if (typeof req.query.limit !== 'undefined') { limit = req.query.limit; } - if(typeof req.query.offset !== 'undefined'){ + if (typeof req.query.offset !== 'undefined') { offset = req.query.offset; } - if( typeof req.query.tag !== 'undefined' ){ - query.tagList = {"$in" : [req.query.tag]}; + if (typeof req.query.tag !== 'undefined') { + query.tagList = { $in: [req.query.tag] }; } Promise.all([ - req.query.author ? User.findOne({username: req.query.author}) : null, - req.query.favorited ? User.findOne({username: req.query.favorited}) : null - ]).then(function(results){ - var author = results[0]; - var favoriter = results[1]; + req.query.author ? User.findOne({ username: req.query.author }) : null, + req.query.favorited ? User.findOne({ username: req.query.favorited }) : null, + ]) + .then(function (results) { + const author = results[0]; + const favoriter = results[1]; - if(author){ - query.author = author._id; - } - - if(favoriter){ - query._id = {$in: favoriter.favorites}; - } else if(req.query.favorited){ - query._id = {$in: []}; - } - - return Promise.all([ - Track.find(query) - .limit(Number(limit)) - .skip(Number(offset)) - .sort({createdAt: 'desc'}) - .populate('author') - .where('visible').equals(true) - .exec(), - Track.countDocuments(query).exec(), - req.payload ? User.findById(req.payload.id) : null, - ]).then(function(results){ - var tracks = results[0]; - var tracksCount = results[1]; - var user = results[2]; - //console.log(tracks); - var retTracks = []; - for (t of tracks) { - //console.log(t); - //if (t.author.areTracksVisibleForAll || t.author == user) { - retTracks.push(t); - //} + if (author) { + query.author = author._id; } - return res.json({ - tracks: retTracks.map(function(track){ - return track.toJSONFor(user); - }), - tracksCount: retTracks.length + + if (favoriter) { + query._id = { $in: favoriter.favorites }; + } else if (req.query.favorited) { + query._id = { $in: [] }; + } + + return Promise.all([ + Track.find(query) + .limit(Number(limit)) + .skip(Number(offset)) + .sort({ createdAt: 'desc' }) + .populate('author') + .where('visible') + .equals(true) + .exec(), + Track.countDocuments(query).exec(), + req.payload ? User.findById(req.payload.id) : null, + ]).then(function (results) { + const tracks = results[0]; + const tracksCount = results[1]; + const user = results[2]; + // console.log(tracks); + const retTracks = []; + for (t of tracks) { + // console.log(t); + // if (t.author.areTracksVisibleForAll || t.author == user) { + retTracks.push(t); + // } + } + return res.json({ + tracks: retTracks.map(function (track) { + return track.toJSONFor(user); + }), + tracksCount: retTracks.length, + }); }); - }); - }).catch(next); + }) + .catch(next); }); -router.get('/feed', auth.required, function(req, res, next) { - var limit = 20; - var offset = 0; +router.get('/feed', auth.required, function (req, res, next) { + let limit = 20; + let offset = 0; - if(typeof req.query.limit !== 'undefined'){ + if (typeof req.query.limit !== 'undefined') { limit = req.query.limit; } - if(typeof req.query.offset !== 'undefined'){ + if (typeof req.query.offset !== 'undefined') { offset = req.query.offset; } - User.findById(req.payload.id).then(function(user){ - if (!user) { return res.sendStatus(401); } - if(user.following != '') - { - Promise.all([ - Track.find({ author: {$in: user.following}}) - .limit(Number(limit)) - .skip(Number(offset)) - .populate('author') - .exec(), - Track.countDocuments({ author: {$in: user.following}}) - ]).then(function(results){ - var tracks = results[0]; - var tracksCount = results[1]; - - return res.json({ - tracks: tracks.map(function(track){ - return track.toJSONFor(user); - }), - tracksCount: tracksCount - }); - }).catch(next); + User.findById(req.payload.id).then(function (user) { + if (!user) { + return res.sendStatus(401); } - else - { - Promise.all([ - Track.find({ author: {$in: req.payload.id}}) - .limit(Number(limit)) - .skip(Number(offset)) - .populate('author') - .exec(), - Track.countDocuments({ author: {$in: req.payload.id}}) - ]).then(function(results){ - var tracks = results[0]; - var tracksCount = results[1]; + if (user.following != '') { + Promise.all([ + Track.find({ author: { $in: user.following } }) + .limit(Number(limit)) + .skip(Number(offset)) + .populate('author') + .exec(), + Track.countDocuments({ author: { $in: user.following } }), + ]) + .then(function (results) { + const tracks = results[0]; + const tracksCount = results[1]; - return res.json({ - tracks: tracks.map(function(track){ - return track.toJSONFor(user); - }), - tracksCount: tracksCount - }); - }).catch(next); + return res.json({ + tracks: tracks.map(function (track) { + return track.toJSONFor(user); + }), + tracksCount: tracksCount, + }); + }) + .catch(next); + } else { + Promise.all([ + Track.find({ author: { $in: req.payload.id } }) + .limit(Number(limit)) + .skip(Number(offset)) + .populate('author') + .exec(), + Track.countDocuments({ author: { $in: req.payload.id } }), + ]) + .then(function (results) { + const tracks = results[0]; + const tracksCount = results[1]; + + return res.json({ + tracks: tracks.map(function (track) { + return track.toJSONFor(user); + }), + tracksCount: tracksCount, + }); + }) + .catch(next); } - - - }); }); -router.post('/', auth.required, function(req, res, next) { - User.findById(req.payload.id).then(function(user){ - if (!user) { return res.sendStatus(401); } +router.post('/', auth.required, function (req, res, next) { + User.findById(req.payload.id) + .then(function (user) { + if (!user) { + return res.sendStatus(401); + } - var track = new Track(req.body.track); - var trackData = new TrackData(); - track.trackData = trackData._id; + const track = new Track(req.body.track); + const trackData = new TrackData(); + track.trackData = trackData._id; - track.author = user; - track.visible = track.author.areTracksVisibleForAll; - trackData.save(function (err){ - if(err){ - console.log("failed to save trackData"); - } - }); + track.author = user; + track.visible = track.author.areTracksVisibleForAll; + trackData.save(function (err) { + if (err) { + console.log('failed to save trackData'); + } + }); - return track.save().then(function(){ - //console.log(track.author); - return res.json({track: track.toJSONFor(user)}); - }); - return res.json({track: track.toJSONFor(user)}); - }).catch(next); + return track.save().then(function () { + // console.log(track.author); + return res.json({ track: track.toJSONFor(user) }); + }); + return res.json({ track: track.toJSONFor(user) }); + }) + .catch(next); }); -router.post('/add', auth.optional, function(req, res, next) { - //console.log("Add"); +router.post('/add', auth.optional, function (req, res, next) { + // console.log("Add"); - //console.log(req.payload); - User.findById(req.body.id).then(function (user) { - if (!user) { return res.sendStatus(401); } + // console.log(req.payload); + User.findById(req.body.id) + .then(function (user) { + if (!user) { + return res.sendStatus(401); + } - var ti = null; - if (currentTracks.has(req.body.id)) - ti = currentTracks.get(req.body.id); + let ti = null; + if (currentTracks.has(req.body.id)) ti = currentTracks.get(req.body.id); - //console.log("TI" + ti); - //console.log("TILen" + ti.trackData.points.length); - //console.log("TITrack" + ti.track); - //console.log("Body" + req.body.track.body); - if (ti.track) { - addPointsToTrack(ti, req.body.track.body); - //console.log("TLen" + ti.trackData.points.length); - ti.track.author = user; - } + // console.log("TI" + ti); + // console.log("TILen" + ti.trackData.points.length); + // console.log("TITrack" + ti.track); + // console.log("Body" + req.body.track.body); + if (ti.track) { + addPointsToTrack(ti, req.body.track.body); + // console.log("TLen" + ti.trackData.points.length); + ti.track.author = user; + } - //return track.save().then(function(){ - // console.log(track.author); - //return res.json({ track: track.toJSONFor(user) }); + // return track.save().then(function(){ + // console.log(track.author); + // return res.json({ track: track.toJSONFor(user) }); return res.sendStatus(200); - //}); - }).catch(next); + // }); + }) + .catch(next); }); router.post('/begin', auth.optional, function (req, res, next) { - //console.log("Begin"); - //console.log(req.payload); - User.findById(req.body.id).then(function (user) { - if (!user) { return res.sendStatus(401); } + // console.log("Begin"); + // console.log(req.payload); + User.findById(req.body.id) + .then(function (user) { + if (!user) { + return res.sendStatus(401); + } - if(currentTracks.has(req.body.id)) - currentTracks.delete(req.body.id); // delete old parts if there are leftovers - var ti = new TrackInfo(new Track(req.body.track),new TrackData()); - ti.track.trackData = ti.trackData._id; - currentTracks.set(req.body.id, ti); + if (currentTracks.has(req.body.id)) currentTracks.delete(req.body.id); // delete old parts if there are leftovers + const ti = new TrackInfo(new Track(req.body.track), new TrackData()); + ti.track.trackData = ti.trackData._id; + currentTracks.set(req.body.id, ti); - //console.log("addToTrack"+req.body); + // console.log("addToTrack"+req.body); - addPointsToTrack(ti, ti.track.body); + addPointsToTrack(ti, ti.track.body); - //console.log("TLen" + ti.track); - //console.log("TLen" + ti.trackData); - //console.log("TLen" + ti.trackData.points.length); + // console.log("TLen" + ti.track); + // console.log("TLen" + ti.trackData); + // console.log("TLen" + ti.trackData.points.length); - //console.log(track.trackData.points[0].date); - ti.track.author = user; + // console.log(track.trackData.points[0].date); + ti.track.author = user; - //return track.save().then(function () { - // console.log(track.author); + // return track.save().then(function () { + // console.log(track.author); return res.sendStatus(200); - //}); - }).catch(next); + // }); + }) + .catch(next); }); router.post('/end', auth.optional, function (req, res, next) { - //console.log("End"); - //console.log(req.payload); - User.findById(req.body.id).then(function (user) { - if (!user) { return res.sendStatus(401); } + // console.log("End"); + // console.log(req.payload); + User.findById(req.body.id) + .then(function (user) { + if (!user) { + return res.sendStatus(401); + } - var track = null; - if (currentTracks.has(req.body.id)) - { - ti = currentTracks.get(req.body.id); - addPointsToTrack(ti, req.body.track.body); - } - else - { - var ti = new TrackInfo(new Track(req.body.track),new TrackData()); - ti.track.trackData = ti.trackData._id; - addPointsToTrack(ti, ti.track.body); - } - if (ti.track) { + const track = null; + if (currentTracks.has(req.body.id)) { + ti = currentTracks.get(req.body.id); + addPointsToTrack(ti, req.body.track.body); + } else { + var ti = new TrackInfo(new Track(req.body.track), new TrackData()); + ti.track.trackData = ti.trackData._id; + addPointsToTrack(ti, ti.track.body); + } + if (ti.track) { + ti.track.author = user; + } + + currentTracks.delete(req.body.id); // we are done with this track, it is complete ti.track.author = user; - } - currentTracks.delete(req.body.id); // we are done with this track, it is complete - ti.track.author = user; + // console.log(track); + // console.log("user:"+user); + return ti.track.save().then(function () { + // console.log("TLen" + ti.track); + // console.log("TLen" + ti.trackData); + // console.log("TLen" + ti.trackData.points.length); + ti.trackData.save(function (err) { + if (err) { + console.log('failed to save trackData' + err.toString()); + } + }); - //console.log(track); - //console.log("user:"+user); - return ti.track.save().then(function () { - //console.log("TLen" + ti.track); - //console.log("TLen" + ti.trackData); - //console.log("TLen" + ti.trackData.points.length); - ti.trackData.save(function (err){ - if(err){ - console.log("failed to save trackData"+err.toString()); - } + console.log('successfulSave:'); + return res.sendStatus(200); }); - - console.log("successfulSave:"); - return res.sendStatus(200); - }); - }).catch(next); + }) + .catch(next); }); // return a track -router.get('/:track', auth.optional, function(req, res, next) { - Promise.all([ - req.payload ? User.findById(req.payload.id) : null, - req.track.populate('author').execPopulate() - ]).then(function(results){ - var user = results[0]; +router.get('/:track', auth.optional, function (req, res, next) { + Promise.all([req.payload ? User.findById(req.payload.id) : null, req.track.populate('author').execPopulate()]) + .then(function (results) { + const user = results[0]; - return res.json({track: req.track.toJSONFor(user)}); - }).catch(next); + return res.json({ track: req.track.toJSONFor(user) }); + }) + .catch(next); }); // update track -router.put('/:track', auth.required, function(req, res, next) { - User.findById(req.payload.id).then(function(user){ - if(req.track.author._id.toString() === req.payload.id.toString()){ - if(typeof req.body.track.title !== 'undefined'){ +router.put('/:track', auth.required, function (req, res, next) { + User.findById(req.payload.id).then(function (user) { + if (req.track.author._id.toString() === req.payload.id.toString()) { + if (typeof req.body.track.title !== 'undefined') { req.track.title = req.body.track.title; } - if(typeof req.body.track.description !== 'undefined'){ + if (typeof req.body.track.description !== 'undefined') { req.track.description = req.body.track.description; } - if(typeof req.body.track.body !== 'undefined'){ + if (typeof req.body.track.body !== 'undefined') { req.track.body = req.body.track.body; } - if(typeof req.body.track.tagList !== 'undefined'){ + if (typeof req.body.track.tagList !== 'undefined') { req.track.tagList = req.body.track.tagList; } req.track.visible = req.body.track.visible; - console.log("saving track"); + console.log('saving track'); - req.track.save().then(function(track){ - return res.json({track: track.toJSONFor(user)}); - }).catch(next); + req.track + .save() + .then(function (track) { + return res.json({ track: track.toJSONFor(user) }); + }) + .catch(next); } else { return res.sendStatus(403); } @@ -330,96 +353,122 @@ router.put('/:track', auth.required, function(req, res, next) { }); // delete track -router.delete('/:track', auth.required, function(req, res, next) { - User.findById(req.payload.id).then(function(user){ - if (!user) { return res.sendStatus(401); } - if(req.track.author._id.toString() === req.payload.id.toString()){ - TrackData.findByIdAndDelete(req.track.trackData, function (err, td) {console.log("doneDelete");}); // delet our track data - return req.track.remove().then(function(){ - return res.sendStatus(204); - }); - } else { - return res.sendStatus(403); - } - }).catch(next); +router.delete('/:track', auth.required, function (req, res, next) { + User.findById(req.payload.id) + .then(function (user) { + if (!user) { + return res.sendStatus(401); + } + if (req.track.author._id.toString() === req.payload.id.toString()) { + TrackData.findByIdAndDelete(req.track.trackData, function (err, td) { + console.log('doneDelete'); + }); // delet our track data + return req.track.remove().then(function () { + return res.sendStatus(204); + }); + } else { + return res.sendStatus(403); + } + }) + .catch(next); }); // Favorite an track -router.post('/:track/favorite', auth.required, function(req, res, next) { - var trackId = req.track._id; +router.post('/:track/favorite', auth.required, function (req, res, next) { + const trackId = req.track._id; - User.findById(req.payload.id).then(function(user){ - if (!user) { return res.sendStatus(401); } + User.findById(req.payload.id) + .then(function (user) { + if (!user) { + return res.sendStatus(401); + } - return user.favorite(trackId).then(function(){ - return req.track.updateFavoriteCount().then(function(track){ - return res.json({track: track.toJSONFor(user)}); + return user.favorite(trackId).then(function () { + return req.track.updateFavoriteCount().then(function (track) { + return res.json({ track: track.toJSONFor(user) }); + }); }); - }); - }).catch(next); + }) + .catch(next); }); // Unfavorite an track -router.delete('/:track/favorite', auth.required, function(req, res, next) { - var trackId = req.track._id; +router.delete('/:track/favorite', auth.required, function (req, res, next) { + const trackId = req.track._id; - User.findById(req.payload.id).then(function (user){ - if (!user) { return res.sendStatus(401); } + User.findById(req.payload.id) + .then(function (user) { + if (!user) { + return res.sendStatus(401); + } - return user.unfavorite(trackId).then(function(){ - return req.track.updateFavoriteCount().then(function(track){ - return res.json({track: track.toJSONFor(user)}); + return user.unfavorite(trackId).then(function () { + return req.track.updateFavoriteCount().then(function (track) { + return res.json({ track: track.toJSONFor(user) }); + }); }); - }); - }).catch(next); + }) + .catch(next); }); // return an track's comments -router.get('/:track/comments', auth.optional, function(req, res, next){ - Promise.resolve(req.payload ? User.findById(req.payload.id) : null).then(function(user){ - return req.track.populate({ - path: 'comments', - populate: { - path: 'author' - }, - options: { - sort: { - createdAt: 'desc' - } - } - }).execPopulate().then(function(track) { - return res.json({comments: req.track.comments.map(function(comment){ - return comment.toJSONFor(user); - })}); - }); - }).catch(next); +router.get('/:track/comments', auth.optional, function (req, res, next) { + Promise.resolve(req.payload ? User.findById(req.payload.id) : null) + .then(function (user) { + return req.track + .populate({ + path: 'comments', + populate: { + path: 'author', + }, + options: { + sort: { + createdAt: 'desc', + }, + }, + }) + .execPopulate() + .then(function (track) { + return res.json({ + comments: req.track.comments.map(function (comment) { + return comment.toJSONFor(user); + }), + }); + }); + }) + .catch(next); }); // create a new comment -router.post('/:track/comments', auth.required, function(req, res, next) { - User.findById(req.payload.id).then(function(user){ - if(!user){ return res.sendStatus(401); } +router.post('/:track/comments', auth.required, function (req, res, next) { + User.findById(req.payload.id) + .then(function (user) { + if (!user) { + return res.sendStatus(401); + } - var comment = new Comment(req.body.comment); - comment.track = req.track; - comment.author = user; + const comment = new Comment(req.body.comment); + comment.track = req.track; + comment.author = user; - return comment.save().then(function(){ - req.track.comments.push(comment); + return comment.save().then(function () { + req.track.comments.push(comment); - return req.track.save().then(function(track) { - res.json({comment: comment.toJSONFor(user)}); + return req.track.save().then(function (track) { + res.json({ comment: comment.toJSONFor(user) }); + }); }); - }); - }).catch(next); + }) + .catch(next); }); -router.delete('/:track/comments/:comment', auth.required, function(req, res, next) { - if(req.comment.author.toString() === req.payload.id.toString()){ +router.delete('/:track/comments/:comment', auth.required, function (req, res, next) { + if (req.comment.author.toString() === req.payload.id.toString()) { req.track.comments.remove(req.comment._id); - req.track.save() - .then(Comment.find({_id: req.comment._id}).remove().exec()) - .then(function(){ + req.track + .save() + .then(Comment.find({ _id: req.comment._id }).remove().exec()) + .then(function () { res.sendStatus(204); }); } else { @@ -428,14 +477,16 @@ router.delete('/:track/comments/:comment', auth.required, function(req, res, nex }); // return an track's trackData -router.get('/:track/TrackData', auth.optional, function(req, res, next){ - Promise.resolve(req.payload ? User.findById(req.payload.id) : null).then(function(user){ - //console.log("requestTrackData"+req.track); - TrackData.findById(req.track.trackData,function(err,trackData){ - //console.log({trackData: trackData}); - return res.json({trackData: trackData}); - }); - }).catch(next); +router.get('/:track/TrackData', auth.optional, function (req, res, next) { + Promise.resolve(req.payload ? User.findById(req.payload.id) : null) + .then(function (user) { + // console.log("requestTrackData"+req.track); + TrackData.findById(req.track.trackData, function (err, trackData) { + // console.log({trackData: trackData}); + return res.json({ trackData: trackData }); + }); + }) + .catch(next); }); module.exports = router; From f414d64480db4615f232e3b953ee9175e177ad43 Mon Sep 17 00:00:00 2001 From: Paul Bienkowski Date: Wed, 18 Nov 2020 21:50:33 +0100 Subject: [PATCH 11/22] fix: allow big uploads (up to 50mb) --- app.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app.js b/app.js index c14fdf3..e1e4d6d 100644 --- a/app.js +++ b/app.js @@ -18,8 +18,8 @@ app.use(cors()); // Normal express config defaults app.use(require('morgan')('dev')); -app.use(bodyParser.urlencoded({ extended: false })); -app.use(bodyParser.json()); +app.use(bodyParser.json({ limit: '50mb' })); +app.use(bodyParser.urlencoded({ limit: '50mb', extended: false })); app.use(require('method-override')()); app.use(express.static(__dirname + '/public')); From f013ab42633ec05774854bad83f8c8c5d97e2234 Mon Sep 17 00:00:00 2001 From: Paul Bienkowski Date: Wed, 18 Nov 2020 21:51:08 +0100 Subject: [PATCH 12/22] refactor: use csv parser for obsver1 instead of selfbuilt solution --- logic/tracks.js | 118 +++++++++++------------------------------------- 1 file changed, 26 insertions(+), 92 deletions(-) diff --git a/logic/tracks.js b/logic/tracks.js index b3a87d5..2ed63f2 100644 --- a/logic/tracks.js +++ b/logic/tracks.js @@ -52,103 +52,37 @@ function detectFormat(body) { return Number(match[2]); } + if (/^Date;Time/.test(firstLine)) { + return 1; + } + return 'invalid'; } function* parseObsver1(body) { - let num = 0; - let start = 0; - let end = 0; - - let currentPoint; - - while (end < body.length) { - start = end; - while (body[end] !== ';' && body[end] !== '$' && end < body.length) { - end++; - } - if (body[end] === '$') { - if (currentPoint) { - yield currentPoint; - } - // $ is replacing \n as newlines are not allowed in json strings - num = 0; - } - if (end < body.length) { - const token = body.substr(start, end - start); - end++; - - if (token.length > 0) { - if (num === 0 && token === 'Date') { - // we have a header line, ignore it for now, TODO parse it - if (end < body.length) { - while (body[end] !== ';' && body[end] !== '$' && end < body.length) { - end++; - } - start = end; - num = 100; - } - } - - switch (num) { - case 0: - currentPoint = { - date: token, - time: '', - latitude: '', - longitude: '', - course: '', - speed: '', - d1: '', - d2: '', - flag: '', - private: '', - }; - break; - - case 1: - currentPoint.time = token; - break; - - case 2: - currentPoint.latitude = _parseFloat(token); - break; - - case 3: - currentPoint.longitude = _parseFloat(token); - break; - - case 4: - currentPoint.course = _parseFloat(token); - break; - - case 5: - currentPoint.speed = _parseFloat(token); - break; - - case 6: - currentPoint.d1 = token; - break; - - case 7: - currentPoint.d2 = token; - break; - - case 8: - currentPoint.flag = token; - break; - - case 9: - currentPoint.private = token; - break; - } - - num++; - } - } + if (body.indexOf('\n') < body.length - 1) { + body = body.replace(/\$/g, '\n'); } - if (currentPoint) { - yield currentPoint; + + for (const record of csvParse(body, { + delimiter: ';', + encoding: 'utf8', + columns: ['date', 'time', 'latitude', 'longitude', 'course', 'speed', 'd1', 'd2', 'flag', 'private'], + relax_column_count: true, + cast(value, { column }) { + if (/latitude|longitude|course|speed/.test(column)) { + return _parseFloat(value); + } else { + return value; + } + }, + })) { + if (record.date === 'Date') { + // ignore header line + continue; + } + + yield record; } } From 0b830601f5a07653730e8c55d4c7fceb278031b4 Mon Sep 17 00:00:00 2001 From: Paul Bienkowski Date: Wed, 18 Nov 2020 22:13:00 +0100 Subject: [PATCH 13/22] feat: autodetect "$ as newlines" hack in both OBSVER1 and OBSVER2 --- logic/tracks.js | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/logic/tracks.js b/logic/tracks.js index 2ed63f2..6f53adb 100644 --- a/logic/tracks.js +++ b/logic/tracks.js @@ -11,7 +11,18 @@ function _parseFloat(token) { return f; } +function replaceDollarNewlinesHack(body) { + // see if we are using the hack with $ as newlines, replace them for the csv parser + if (body.endsWith('$')) { + return body.replace(/\$/g, '\n'); + } + + return body; +} + function addPointsToTrack(trackInfo, body, format = null) { + body = replaceDollarNewlinesHack(body); + const detectedFormat = format != null ? format : detectFormat(body); let parser; @@ -60,10 +71,6 @@ function detectFormat(body) { } function* parseObsver1(body) { - if (body.indexOf('\n') < body.length - 1) { - body = body.replace(/\$/g, '\n'); - } - for (const record of csvParse(body, { delimiter: ';', encoding: 'utf8', From f3740e5f37dcdaf921329a9e9c90ccf499a14ed2 Mon Sep 17 00:00:00 2001 From: Paul Bienkowski Date: Wed, 18 Nov 2020 22:17:00 +0100 Subject: [PATCH 14/22] feat: generate TrackData points when saving tracks through PUT, and return raw body through GET /:track --- models/Track.js | 5 ++-- routes/api/tracks.js | 58 +++++++++++++++++++++++--------------------- 2 files changed, 34 insertions(+), 29 deletions(-) diff --git a/models/Track.js b/models/Track.js index edb165d..557e633 100644 --- a/models/Track.js +++ b/models/Track.js @@ -30,7 +30,7 @@ TrackSchema.methods.slugify = function() { this.slug = slug(this.title) + '-' + (Math.random() * Math.pow(36, 6) | 0).toString(36); }; -TrackSchema.methods.toJSONFor = function(user){ +TrackSchema.methods.toJSONFor = function (user, include) { return { slug: this.slug, title: this.title, @@ -39,7 +39,8 @@ TrackSchema.methods.toJSONFor = function(user){ updatedAt: this.updatedAt, visibleForAll: this.author ? this.author.areTracksVisibleForAll : false, visible: this.visible, - author: this.author.toProfileJSONFor(user) + author: this.author.toProfileJSONFor(user), + ...(include?.body ? { body: this.body } : {}), }; }; diff --git a/routes/api/tracks.js b/routes/api/tracks.js index 019d279..eead1cf 100644 --- a/routes/api/tracks.js +++ b/routes/api/tracks.js @@ -313,43 +313,47 @@ router.get('/:track', auth.optional, function (req, res, next) { .then(function (results) { const user = results[0]; - return res.json({ track: req.track.toJSONFor(user) }); + return res.json({ track: req.track.toJSONFor(user, { body: true }) }); }) .catch(next); }); // update track -router.put('/:track', auth.required, function (req, res, next) { - User.findById(req.payload.id).then(function (user) { - if (req.track.author._id.toString() === req.payload.id.toString()) { - if (typeof req.body.track.title !== 'undefined') { - req.track.title = req.body.track.title; - } +router.put('/:track', auth.required, async function (req, res, next) { + const user = await User.findById(req.payload.id); - if (typeof req.body.track.description !== 'undefined') { - req.track.description = req.body.track.description; - } + if (req.track.author._id.toString() !== req.payload.id.toString()) { + return res.sendStatus(403); + } - if (typeof req.body.track.body !== 'undefined') { - req.track.body = req.body.track.body; - } + if (typeof req.body.track.title !== 'undefined') { + req.track.title = req.body.track.title; + } - if (typeof req.body.track.tagList !== 'undefined') { - req.track.tagList = req.body.track.tagList; - } - req.track.visible = req.body.track.visible; - console.log('saving track'); + if (typeof req.body.track.description !== 'undefined') { + req.track.description = req.body.track.description; + } - req.track - .save() - .then(function (track) { - return res.json({ track: track.toJSONFor(user) }); - }) - .catch(next); - } else { - return res.sendStatus(403); + if (req.body.track.body?.trim()) { + req.track.body = req.body.track.body.trim(); + + let trackData = await TrackData.findById(req.track.trackData); + if (!trackData) { + trackData = new TrackData(); + req.track.trackData = trackData._id; } - }); + trackData.points = []; + addPointsToTrack({ trackData }, req.track.body); + await trackData.save(); + } + + if (typeof req.body.track.tagList !== 'undefined') { + req.track.tagList = req.body.track.tagList; + } + req.track.visible = req.body.track.visible; + + const track = await req.track.save(); + return res.json({ track: track.toJSONFor(user) }); }); // delete track From 114a9677f1af13758ef6ea7b82776b2d33f2db90 Mon Sep 17 00:00:00 2001 From: Paul Bienkowski Date: Wed, 18 Nov 2020 22:30:25 +0100 Subject: [PATCH 15/22] chore: fix some eslint in routes/api/tracks.js --- routes/api/tracks.js | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/routes/api/tracks.js b/routes/api/tracks.js index eead1cf..94e9654 100644 --- a/routes/api/tracks.js +++ b/routes/api/tracks.js @@ -87,11 +87,11 @@ router.get('/', auth.optional, function (req, res, next) { req.payload ? User.findById(req.payload.id) : null, ]).then(function (results) { const tracks = results[0]; - const tracksCount = results[1]; + // const tracksCount = results[1]; const user = results[2]; // console.log(tracks); const retTracks = []; - for (t of tracks) { + for (const t of tracks) { // console.log(t); // if (t.author.areTracksVisibleForAll || t.author == user) { retTracks.push(t); @@ -124,7 +124,7 @@ router.get('/feed', auth.required, function (req, res, next) { if (!user) { return res.sendStatus(401); } - if (user.following != '') { + if (user.following !== '') { Promise.all([ Track.find({ author: { $in: user.following } }) .limit(Number(limit)) @@ -193,7 +193,6 @@ router.post('/', auth.required, function (req, res, next) { // console.log(track.author); return res.json({ track: track.toJSONFor(user) }); }); - return res.json({ track: track.toJSONFor(user) }); }) .catch(next); }); @@ -272,12 +271,12 @@ router.post('/end', auth.optional, function (req, res, next) { return res.sendStatus(401); } - const track = null; + let ti; if (currentTracks.has(req.body.id)) { ti = currentTracks.get(req.body.id); addPointsToTrack(ti, req.body.track.body); } else { - var ti = new TrackInfo(new Track(req.body.track), new TrackData()); + ti = new TrackInfo(new Track(req.body.track), new TrackData()); ti.track.trackData = ti.trackData._id; addPointsToTrack(ti, ti.track.body); } From f890fc673f842470c721ae6668e148fd13072b7f Mon Sep 17 00:00:00 2001 From: Paul Bienkowski Date: Wed, 18 Nov 2020 23:00:08 +0100 Subject: [PATCH 16/22] refactor: switch to async/await syntax in track routes --- package.json | 2 +- routes/api/tracks.js | 724 +++++++++++++++++++++---------------------- 2 files changed, 348 insertions(+), 378 deletions(-) diff --git a/package.json b/package.json index 7e38eaa..efd9a6a 100644 --- a/package.json +++ b/package.json @@ -8,7 +8,7 @@ "start": "node ./app.js", "dev": "nodemon ./app.js", "mongo:stop": "docker stop realworld-mongo && docker rm realworld-mongo", - "autoformat": "eslint --fix logic", + "autoformat": "eslint --fix logic routes/api/tracks.js", "test": "jest" }, "repository": { diff --git a/routes/api/tracks.js b/routes/api/tracks.js index 94e9654..12c5a1d 100644 --- a/routes/api/tracks.js +++ b/routes/api/tracks.js @@ -9,313 +9,286 @@ const currentTracks = new Map(); const TrackInfo = require('../../logic/TrackInfo'); const { addPointsToTrack } = require('../../logic/tracks'); +const wrapRoute = (fn) => async (req, res, next) => { + try { + return await fn(req, res); + } catch (err) { + next(err); + } +}; + // Preload track objects on routes with ':track' -router.param('track', function (req, res, next, slug) { - Track.findOne({ slug: slug }) - .populate('author') - .then(function (track) { - if (!track) { - return res.sendStatus(404); - } +router.param('track', async (req, res, next, slug) => { + try { + const track = await Track.findOne({ slug }).populate('author'); - req.track = track; + if (!track) { + return res.sendStatus(404); + } - return next(); - }) - .catch(next); + req.track = track; + + return next(); + } catch (err) { + return next(err); + } }); -router.param('comment', function (req, res, next, id) { - Comment.findById(id) - .then(function (comment) { - if (!comment) { - return res.sendStatus(404); - } +router.param('comment', async (req, res, next, id) => { + try { + const comment = await Comment.findById(id); - req.comment = comment; + if (!comment) { + return res.sendStatus(404); + } - return next(); - }) - .catch(next); + req.comment = comment; + + return next(); + } catch (err) { + return next(err); + } }); -router.get('/', auth.optional, function (req, res, next) { - const query = {}; - let limit = 20; - let offset = 0; +router.get( + '/', + auth.optional, + wrapRoute(async (req, res) => { + const query = {}; + let limit = 20; + let offset = 0; - if (typeof req.query.limit !== 'undefined') { - limit = req.query.limit; - } + if (typeof req.query.limit !== 'undefined') { + limit = req.query.limit; + } - if (typeof req.query.offset !== 'undefined') { - offset = req.query.offset; - } + if (typeof req.query.offset !== 'undefined') { + offset = req.query.offset; + } - if (typeof req.query.tag !== 'undefined') { - query.tagList = { $in: [req.query.tag] }; - } + if (typeof req.query.tag !== 'undefined') { + query.tagList = { $in: [req.query.tag] }; + } - Promise.all([ - req.query.author ? User.findOne({ username: req.query.author }) : null, - req.query.favorited ? User.findOne({ username: req.query.favorited }) : null, - ]) - .then(function (results) { - const author = results[0]; - const favoriter = results[1]; + const [author, favoriter] = await Promise.all([ + req.query.author ? User.findOne({ username: req.query.author }) : null, + req.query.favorited ? User.findOne({ username: req.query.favorited }) : null, + ]); - if (author) { - query.author = author._id; - } + if (author) { + query.author = author._id; + } - if (favoriter) { - query._id = { $in: favoriter.favorites }; - } else if (req.query.favorited) { - query._id = { $in: [] }; - } + if (favoriter) { + query._id = { $in: favoriter.favorites }; + } else if (req.query.favorited) { + query._id = { $in: [] }; + } - return Promise.all([ - Track.find(query) - .limit(Number(limit)) - .skip(Number(offset)) - .sort({ createdAt: 'desc' }) - .populate('author') - .where('visible') - .equals(true) - .exec(), - Track.countDocuments(query).exec(), - req.payload ? User.findById(req.payload.id) : null, - ]).then(function (results) { - const tracks = results[0]; - // const tracksCount = results[1]; - const user = results[2]; - // console.log(tracks); - const retTracks = []; - for (const t of tracks) { - // console.log(t); - // if (t.author.areTracksVisibleForAll || t.author == user) { - retTracks.push(t); - // } - } - return res.json({ - tracks: retTracks.map(function (track) { - return track.toJSONFor(user); - }), - tracksCount: retTracks.length, - }); - }); - }) - .catch(next); -}); + const results = await Promise.all([ + Track.find(query) + .limit(Number(limit)) + .skip(Number(offset)) + .sort({ createdAt: 'desc' }) + .populate('author') + .where('visible') + .equals(true) + .exec(), + Track.countDocuments(query).exec(), + req.payload ? User.findById(req.payload.id) : null, + ]); -router.get('/feed', auth.required, function (req, res, next) { - let limit = 20; - let offset = 0; + const [tracks, tracksCount, user] = results; - if (typeof req.query.limit !== 'undefined') { - limit = req.query.limit; - } + return res.json({ + tracks: tracks.map((track) => track.toJSONFor(user)), + tracksCount, + }); + }), +); - if (typeof req.query.offset !== 'undefined') { - offset = req.query.offset; - } +router.get( + '/feed', + auth.required, + wrapRoute(async (req, res) => { + let limit = 20; + let offset = 0; + + if (typeof req.query.limit !== 'undefined') { + limit = req.query.limit; + } + + if (typeof req.query.offset !== 'undefined') { + offset = req.query.offset; + } + + const user = await User.findById(req.payload.id); - User.findById(req.payload.id).then(function (user) { if (!user) { return res.sendStatus(401); } - if (user.following !== '') { - Promise.all([ - Track.find({ author: { $in: user.following } }) - .limit(Number(limit)) - .skip(Number(offset)) - .populate('author') - .exec(), - Track.countDocuments({ author: { $in: user.following } }), - ]) - .then(function (results) { - const tracks = results[0]; - const tracksCount = results[1]; - return res.json({ - tracks: tracks.map(function (track) { - return track.toJSONFor(user); - }), - tracksCount: tracksCount, - }); - }) - .catch(next); - } else { - Promise.all([ - Track.find({ author: { $in: req.payload.id } }) - .limit(Number(limit)) - .skip(Number(offset)) - .populate('author') - .exec(), - Track.countDocuments({ author: { $in: req.payload.id } }), - ]) - .then(function (results) { - const tracks = results[0]; - const tracksCount = results[1]; + const showByUserIds = [req.payload.id, ...(user.following || [])]; - return res.json({ - tracks: tracks.map(function (track) { - return track.toJSONFor(user); - }), - tracksCount: tracksCount, - }); - }) - .catch(next); + const [tracks, tracksCount] = await Promise.all([ + Track.find({ author: { $in: showByUserIds } }) + .limit(Number(limit)) + .skip(Number(offset)) + .populate('author') + .exec(), + Track.countDocuments({ author: { $in: showByUserIds } }), + ]); + + return res.json({ + tracks: tracks.map(function (track) { + return track.toJSONFor(user); + }), + tracksCount: tracksCount, + }); + }), +); + +router.post( + '/', + auth.required, + wrapRoute(async (req, res) => { + const user = await User.findById(req.payload.id); + + if (!user) { + return res.sendStatus(401); } - }); -}); -router.post('/', auth.required, function (req, res, next) { - User.findById(req.payload.id) - .then(function (user) { - if (!user) { - return res.sendStatus(401); - } + const track = new Track(req.body.track); + const trackData = new TrackData(); + track.trackData = trackData._id; - const track = new Track(req.body.track); - const trackData = new TrackData(); - track.trackData = trackData._id; + track.author = user; + track.visible = track.author.areTracksVisibleForAll; + await trackData.save(); - track.author = user; - track.visible = track.author.areTracksVisibleForAll; - trackData.save(function (err) { - if (err) { - console.log('failed to save trackData'); - } - }); + await track.save(); - return track.save().then(function () { - // console.log(track.author); - return res.json({ track: track.toJSONFor(user) }); - }); - }) - .catch(next); -}); + // console.log(track.author); + return res.json({ track: track.toJSONFor(user) }); + }), +); -router.post('/add', auth.optional, function (req, res, next) { - // console.log("Add"); +router.post( + '/add', + auth.optional, + wrapRoute(async (req, res) => { + // console.log("Add"); - // console.log(req.payload); - User.findById(req.body.id) - .then(function (user) { - if (!user) { - return res.sendStatus(401); - } + // console.log(req.payload); + const user = await User.findById(req.body.id); - let ti = null; - if (currentTracks.has(req.body.id)) ti = currentTracks.get(req.body.id); + if (!user) { + return res.sendStatus(401); + } - // console.log("TI" + ti); - // console.log("TILen" + ti.trackData.points.length); - // console.log("TITrack" + ti.track); - // console.log("Body" + req.body.track.body); - if (ti.track) { - addPointsToTrack(ti, req.body.track.body); - // console.log("TLen" + ti.trackData.points.length); - ti.track.author = user; - } + let ti = null; + if (currentTracks.has(req.body.id)) ti = currentTracks.get(req.body.id); - // return track.save().then(function(){ - // console.log(track.author); - // return res.json({ track: track.toJSONFor(user) }); - return res.sendStatus(200); - // }); - }) - .catch(next); -}); - -router.post('/begin', auth.optional, function (req, res, next) { - // console.log("Begin"); - // console.log(req.payload); - User.findById(req.body.id) - .then(function (user) { - if (!user) { - return res.sendStatus(401); - } - - if (currentTracks.has(req.body.id)) currentTracks.delete(req.body.id); // delete old parts if there are leftovers - const ti = new TrackInfo(new Track(req.body.track), new TrackData()); - ti.track.trackData = ti.trackData._id; - currentTracks.set(req.body.id, ti); - - // console.log("addToTrack"+req.body); - - addPointsToTrack(ti, ti.track.body); - - // console.log("TLen" + ti.track); - // console.log("TLen" + ti.trackData); + // console.log("TI" + ti); + // console.log("TILen" + ti.trackData.points.length); + // console.log("TITrack" + ti.track); + // console.log("Body" + req.body.track.body); + if (ti.track) { + addPointsToTrack(ti, req.body.track.body); // console.log("TLen" + ti.trackData.points.length); - - // console.log(track.trackData.points[0].date); ti.track.author = user; + } - // return track.save().then(function () { - // console.log(track.author); - return res.sendStatus(200); - // }); - }) - .catch(next); -}); + // await track.save() + // return res.json({ track: track.toJSONFor(user) }); + return res.sendStatus(200); + }), +); -router.post('/end', auth.optional, function (req, res, next) { - // console.log("End"); - // console.log(req.payload); - User.findById(req.body.id) - .then(function (user) { - if (!user) { - return res.sendStatus(401); - } +router.post( + '/begin', + auth.optional, + wrapRoute(async (req, res) => { + // console.log("Begin"); + // console.log(req.payload); + const user = await User.findById(req.body.id); - let ti; - if (currentTracks.has(req.body.id)) { - ti = currentTracks.get(req.body.id); - addPointsToTrack(ti, req.body.track.body); - } else { - ti = new TrackInfo(new Track(req.body.track), new TrackData()); - ti.track.trackData = ti.trackData._id; - addPointsToTrack(ti, ti.track.body); - } - if (ti.track) { - ti.track.author = user; - } + if (!user) { + return res.sendStatus(401); + } - currentTracks.delete(req.body.id); // we are done with this track, it is complete + if (currentTracks.has(req.body.id)) currentTracks.delete(req.body.id); // delete old parts if there are leftovers + const ti = new TrackInfo(new Track(req.body.track), new TrackData()); + ti.track.trackData = ti.trackData._id; + currentTracks.set(req.body.id, ti); + + // console.log("addToTrack"+req.body); + + addPointsToTrack(ti, ti.track.body); + + // console.log("TLen" + ti.track); + // console.log("TLen" + ti.trackData); + // console.log("TLen" + ti.trackData.points.length); + + // console.log(track.trackData.points[0].date); + ti.track.author = user; + + // await track.save() + // console.log(track.author); + return res.sendStatus(200); + }), +); + +router.post( + '/end', + auth.optional, + wrapRoute(async (req, res) => { + const user = await User.findById(req.body.id); + if (!user) { + return res.sendStatus(401); + } + + let ti; + if (currentTracks.has(req.body.id)) { + ti = currentTracks.get(req.body.id); + addPointsToTrack(ti, req.body.track.body); + } else { + ti = new TrackInfo(new Track(req.body.track), new TrackData()); + ti.track.trackData = ti.trackData._id; + addPointsToTrack(ti, ti.track.body); + } + if (ti.track) { ti.track.author = user; + } - // console.log(track); - // console.log("user:"+user); - return ti.track.save().then(function () { - // console.log("TLen" + ti.track); - // console.log("TLen" + ti.trackData); - // console.log("TLen" + ti.trackData.points.length); - ti.trackData.save(function (err) { - if (err) { - console.log('failed to save trackData' + err.toString()); - } - }); + currentTracks.delete(req.body.id); // we are done with this track, it is complete + ti.track.author = user; - console.log('successfulSave:'); - return res.sendStatus(200); - }); - }) - .catch(next); -}); + // console.log(track); + // console.log("user:"+user); + await ti.track.save(); + + // console.log("TLen" + ti.track); + // console.log("TLen" + ti.trackData); + // console.log("TLen" + ti.trackData.points.length); + await ti.trackData.save(); + + return res.sendStatus(200); + }), +); // return a track -router.get('/:track', auth.optional, function (req, res, next) { - Promise.all([req.payload ? User.findById(req.payload.id) : null, req.track.populate('author').execPopulate()]) - .then(function (results) { - const user = results[0]; - - return res.json({ track: req.track.toJSONFor(user, { body: true }) }); - }) - .catch(next); -}); +router.get( + '/:track', + auth.optional, + wrapRoute(async (req, res) => { + const [user] = await Promise.all([ + req.payload ? User.findById(req.payload.id) : null, + req.track.populate('author').execPopulate(), + ]); + return res.json({ track: req.track.toJSONFor(user, { body: true }) }); + }), +); // update track router.put('/:track', auth.required, async function (req, res, next) { @@ -356,140 +329,137 @@ router.put('/:track', auth.required, async function (req, res, next) { }); // delete track -router.delete('/:track', auth.required, function (req, res, next) { - User.findById(req.payload.id) - .then(function (user) { - if (!user) { - return res.sendStatus(401); - } - if (req.track.author._id.toString() === req.payload.id.toString()) { - TrackData.findByIdAndDelete(req.track.trackData, function (err, td) { - console.log('doneDelete'); - }); // delet our track data - return req.track.remove().then(function () { - return res.sendStatus(204); - }); - } else { - return res.sendStatus(403); - } - }) - .catch(next); -}); +router.delete( + '/:track', + auth.required, + wrapRoute(async (req, res) => { + const user = await User.findById(req.payload.id); + if (!user) { + return res.sendStatus(401); + } + if (req.track.author._id.toString() === req.payload.id.toString()) { + await TrackData.findByIdAndDelete(req.track.trackData); + await req.track.remove(); + return res.sendStatus(204); + } else { + return res.sendStatus(403); + } + }), +); // Favorite an track -router.post('/:track/favorite', auth.required, function (req, res, next) { - const trackId = req.track._id; +router.post( + '/:track/favorite', + auth.required, + wrapRoute(async (req, res) => { + const trackId = req.track._id; - User.findById(req.payload.id) - .then(function (user) { - if (!user) { - return res.sendStatus(401); - } + const user = await User.findById(req.payload.id); + if (!user) { + return res.sendStatus(401); + } - return user.favorite(trackId).then(function () { - return req.track.updateFavoriteCount().then(function (track) { - return res.json({ track: track.toJSONFor(user) }); - }); - }); - }) - .catch(next); -}); + await user.favorite(trackId); + const track = await req.track.updateFavoriteCount(); + return res.json({ track: track.toJSONFor(user) }); + }), +); // Unfavorite an track -router.delete('/:track/favorite', auth.required, function (req, res, next) { - const trackId = req.track._id; +router.delete( + '/:track/favorite', + auth.required, + wrapRoute(async (req, res) => { + const trackId = req.track._id; - User.findById(req.payload.id) - .then(function (user) { - if (!user) { - return res.sendStatus(401); - } + const user = await User.findById(req.payload.id); + if (!user) { + return res.sendStatus(401); + } - return user.unfavorite(trackId).then(function () { - return req.track.updateFavoriteCount().then(function (track) { - return res.json({ track: track.toJSONFor(user) }); - }); - }); - }) - .catch(next); -}); + await user.unfavorite(trackId); + const track = await req.track.updateFavoriteCount(); + return res.json({ track: track.toJSONFor(user) }); + }), +); // return an track's comments -router.get('/:track/comments', auth.optional, function (req, res, next) { - Promise.resolve(req.payload ? User.findById(req.payload.id) : null) - .then(function (user) { - return req.track - .populate({ - path: 'comments', - populate: { - path: 'author', +router.get( + '/:track/comments', + auth.optional, + wrapRoute(async (req, res) => { + const user = await Promise.resolve(req.payload ? User.findById(req.payload.id) : null); + + await req.track + .populate({ + path: 'comments', + populate: { + path: 'author', + }, + options: { + sort: { + createdAt: 'desc', }, - options: { - sort: { - createdAt: 'desc', - }, - }, - }) - .execPopulate() - .then(function (track) { - return res.json({ - comments: req.track.comments.map(function (comment) { - return comment.toJSONFor(user); - }), - }); - }); - }) - .catch(next); -}); + }, + }) + .execPopulate(); + + return res.json({ + comments: req.track.comments.map(function (comment) { + return comment.toJSONFor(user); + }), + }); + }), +); // create a new comment -router.post('/:track/comments', auth.required, function (req, res, next) { - User.findById(req.payload.id) - .then(function (user) { - if (!user) { - return res.sendStatus(401); - } +router.post( + '/:track/comments', + auth.required, + wrapRoute(async (req, res) => { + const user = await User.findById(req.payload.id); + if (!user) { + return res.sendStatus(401); + } - const comment = new Comment(req.body.comment); - comment.track = req.track; - comment.author = user; + const comment = new Comment(req.body.comment); + comment.track = req.track; + comment.author = user; - return comment.save().then(function () { - req.track.comments.push(comment); + await comment.save(); - return req.track.save().then(function (track) { - res.json({ comment: comment.toJSONFor(user) }); - }); - }); - }) - .catch(next); -}); + req.track.comments.push(comment); -router.delete('/:track/comments/:comment', auth.required, function (req, res, next) { - if (req.comment.author.toString() === req.payload.id.toString()) { - req.track.comments.remove(req.comment._id); - req.track - .save() - .then(Comment.find({ _id: req.comment._id }).remove().exec()) - .then(function () { - res.sendStatus(204); - }); - } else { - res.sendStatus(403); - } -}); + await req.track.save(); + return res.json({ comment: comment.toJSONFor(user) }); + }), +); + +router.delete( + '/:track/comments/:comment', + auth.required, + wrapRoute(async (req, res) => { + if (req.comment.author.toString() === req.payload.id.toString()) { + req.track.comments.remove(req.comment._id); + await req.track.save(); + await Comment.find({ _id: req.comment._id }).remove(); + res.sendStatus(204); + } else { + res.sendStatus(403); + } + }), +); // return an track's trackData -router.get('/:track/TrackData', auth.optional, function (req, res, next) { - Promise.resolve(req.payload ? User.findById(req.payload.id) : null) - .then(function (user) { - // console.log("requestTrackData"+req.track); - TrackData.findById(req.track.trackData, function (err, trackData) { - // console.log({trackData: trackData}); - return res.json({ trackData: trackData }); - }); - }) - .catch(next); -}); +router.get( + '/:track/TrackData', + auth.optional, + wrapRoute(async (req, res) => { + // console.log("requestTrackData"+req.track); + const trackData = await TrackData.findById(req.track.trackData); + // console.log({trackData: trackData}); + return res.json({ trackData: trackData }); + }), +); module.exports = router; From f8bb6e7ab7c5669f8bfb53e650a4fbbc922f7389 Mon Sep 17 00:00:00 2001 From: Paul Bienkowski Date: Thu, 19 Nov 2020 17:48:45 +0100 Subject: [PATCH 17/22] fix: when detecting format, first apply the dollar->newline hack --- logic/tracks.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/logic/tracks.js b/logic/tracks.js index 6f53adb..1219e53 100644 --- a/logic/tracks.js +++ b/logic/tracks.js @@ -46,6 +46,8 @@ function addPointsToTrack(trackInfo, body, format = null) { } function detectFormat(body) { + body = replaceDollarNewlinesHack(body) + if (!body.length) { return 'invalid'; } @@ -53,7 +55,9 @@ function detectFormat(body) { const firstLinebreakIndex = body.indexOf('\n'); if (firstLinebreakIndex === -1) { - return 1; + // We need at least one linebreak in the whole file, to separate header and + // data. If the file contains no header, it is in valid. + return 'invalid' } const firstLine = body.substring(0, firstLinebreakIndex); @@ -63,6 +67,8 @@ function detectFormat(body) { return Number(match[2]); } + // If we have no metadata line, but start immediately with a header, it is + // format version 1. if (/^Date;Time/.test(firstLine)) { return 1; } From 598c6620d7f72929e4f143e8fb504ab988253fad Mon Sep 17 00:00:00 2001 From: Paul Bienkowski Date: Sat, 21 Nov 2020 13:15:49 +0100 Subject: [PATCH 18/22] fix: correctly detect format OBSVER1 if there is no header, just data This is required for OBS compatibility, which drops the header line on upload. --- logic/tracks.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/logic/tracks.js b/logic/tracks.js index 1219e53..43a4b88 100644 --- a/logic/tracks.js +++ b/logic/tracks.js @@ -73,6 +73,13 @@ function detectFormat(body) { return 1; } + // If we immediately start with data (a date, formatted as DD.MM.YYYY), then + // we have an old OBS not sending the header. It must therefore be old + // format, too. + if (/^[0-9]{2}\.[0-9]{2}\.[0-9]{4};/.test(firstLine)) { + return 1; + } + return 'invalid'; } From 16ca8db8c75a7f31806202b103dbfe4eab726fc9 Mon Sep 17 00:00:00 2001 From: Paul Bienkowski Date: Sat, 21 Nov 2020 13:26:52 +0100 Subject: [PATCH 19/22] feat: properly parse data types in OBSVER1 --- logic/tracks.js | 55 +++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 53 insertions(+), 2 deletions(-) diff --git a/logic/tracks.js b/logic/tracks.js index 43a4b88..d77cf1e 100644 --- a/logic/tracks.js +++ b/logic/tracks.js @@ -1,16 +1,57 @@ const csvParse = require('csv-parse/lib/sync'); function _parseFloat(token) { + if (typeof token !== 'string') { + return null + } + + token = token.trim() + + if (token === '') { + return null + } + + if (/^nan$/i.test(token)) { + return null + } + let f = parseFloat(token); + if (isNaN(f)) { f = parseFloat(token.substring(0, 10)); } + if (isNaN(f)) { f = 0.0; } + return f; } +function _parseInt(token) { + const asFloat = parseFloat(token) + if (asFloat !== null) { + return Math.floor(asFloat) + } else{ + return asFloat + } +} + +function _parseString(token) { + if (typeof token !== 'string') { + return null + } + // This time we do not trim -- because we assume that the quoting mechanism + // from CSV might have kicked in and we actually want the spacing around the + // token. + + if (token === '') { + return null + } + + return token +} + function replaceDollarNewlinesHack(body) { // see if we are using the hack with $ as newlines, replace them for the csv parser if (body.endsWith('$')) { @@ -87,13 +128,23 @@ function* parseObsver1(body) { for (const record of csvParse(body, { delimiter: ';', encoding: 'utf8', + // We specify different column names here, as the order of columns was + // always the same, but their naming was different. By enforicing these + // column names we don't have to translate between them. Then we just + // ignore the first line (or any line that starts with "Date;"). + // Original header usually is: + // Date;Time;Latitude;Longitude;Course;Speed;Right;Left;Confirmed;insidePrivacyArea columns: ['date', 'time', 'latitude', 'longitude', 'course', 'speed', 'd1', 'd2', 'flag', 'private'], relax_column_count: true, cast(value, { column }) { - if (/latitude|longitude|course|speed/.test(column)) { + if (['latitude', 'longitude', 'course', 'speed'].includes(column)) { return _parseFloat(value); + } else if (['d1', 'd2', 'flag'].includes(column)) { + return _parseInt(value); + } else if (column === 'private') { + return Boolean(_parseInt(value)); } else { - return value; + return _parseString(value); } }, })) { From 0c3cf9263d484fe48b8b4afa1effed2ce980346b Mon Sep 17 00:00:00 2001 From: Paul Bienkowski Date: Sat, 21 Nov 2020 13:47:56 +0100 Subject: [PATCH 20/22] feat: parse body when POSTing a new track --- routes/api/tracks.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/routes/api/tracks.js b/routes/api/tracks.js index 12c5a1d..a967158 100644 --- a/routes/api/tracks.js +++ b/routes/api/tracks.js @@ -162,6 +162,11 @@ router.post( const trackData = new TrackData(); track.trackData = trackData._id; + if (req.body.track.body?.trim()) { + trackData.points = []; + addPointsToTrack({ trackData }, track.body); + } + track.author = user; track.visible = track.author.areTracksVisibleForAll; await trackData.save(); From 7aa6e0be84deeeba1b5529debee8067ae2099863 Mon Sep 17 00:00:00 2001 From: Paul Bienkowski Date: Sat, 21 Nov 2020 13:48:22 +0100 Subject: [PATCH 21/22] feat: in OBSVER1, sanitize d1, d2, latitude and longitude values to null where appropriate --- logic/tracks.js | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/logic/tracks.js b/logic/tracks.js index d77cf1e..27adb65 100644 --- a/logic/tracks.js +++ b/logic/tracks.js @@ -153,6 +153,21 @@ function* parseObsver1(body) { continue; } + if (!record.latitude && !record.longitude) { + // invalid record, make sure lat/lng say `null` instead of `0` + record.latitude = null + record.longitude = null + } + + // in old format, 255 or 999 means "no measurement" + if (record.d1 === 255 || record.d1 === 999) { + record.d1 = null + } + + if (record.d2 === 255 || record.d2 === 999) { + record.d2 = null + } + yield record; } } From bcf9f95c6dd5dbc13398f77ba5f88a4734092901 Mon Sep 17 00:00:00 2001 From: Paul Bienkowski Date: Sat, 21 Nov 2020 17:49:38 +0100 Subject: [PATCH 22/22] fix: do not use ?. operator for node 10 --- models/Track.js | 2 +- routes/api/tracks.js | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/models/Track.js b/models/Track.js index 557e633..f4d441e 100644 --- a/models/Track.js +++ b/models/Track.js @@ -40,7 +40,7 @@ TrackSchema.methods.toJSONFor = function (user, include) { visibleForAll: this.author ? this.author.areTracksVisibleForAll : false, visible: this.visible, author: this.author.toProfileJSONFor(user), - ...(include?.body ? { body: this.body } : {}), + ...(include && include.body ? { body: this.body } : {}), }; }; diff --git a/routes/api/tracks.js b/routes/api/tracks.js index a967158..6a52aa4 100644 --- a/routes/api/tracks.js +++ b/routes/api/tracks.js @@ -162,7 +162,7 @@ router.post( const trackData = new TrackData(); track.trackData = trackData._id; - if (req.body.track.body?.trim()) { + if (req.body.track.body && req.body.track.body.trim()) { trackData.points = []; addPointsToTrack({ trackData }, track.body); } @@ -311,7 +311,7 @@ router.put('/:track', auth.required, async function (req, res, next) { req.track.description = req.body.track.description; } - if (req.body.track.body?.trim()) { + if (req.body.track.body && req.body.track.body.trim()) { req.track.body = req.body.track.body.trim(); let trackData = await TrackData.findById(req.track.trackData);