From 8f9057dfe6e02b83a33bde665640c27a9d4bdfca Mon Sep 17 00:00:00 2001 From: "Steven R. Loomis" Date: Tue, 10 Jul 2018 15:29:11 -0700 Subject: [PATCH 1/8] add files from gp-res-filter ac6bc0b22cefa126b36882231f6178c190001465 --- test/gp-res-filter.d/input.json | 30 ++ test/gp-res-filter.d/merge-output.json | 5 + test/gp-res-filter.d/other-input.json | 6 + test/gp-res-filter.d/output.json | 1 + test/gp-res-filter.d/testSplitKeys.json | 432 ++++++++++++++++++++++++ test/gp-res-filter.d/write-output.json | 62 ++++ 6 files changed, 536 insertions(+) create mode 100644 test/gp-res-filter.d/input.json create mode 100644 test/gp-res-filter.d/merge-output.json create mode 100644 test/gp-res-filter.d/other-input.json create mode 100644 test/gp-res-filter.d/output.json create mode 100644 test/gp-res-filter.d/testSplitKeys.json create mode 100644 test/gp-res-filter.d/write-output.json diff --git a/test/gp-res-filter.d/input.json b/test/gp-res-filter.d/input.json new file mode 100644 index 0000000..85e7865 --- /dev/null +++ b/test/gp-res-filter.d/input.json @@ -0,0 +1,30 @@ +{ + "bears": { + "grizzly": { + "brown": "Brown Bear", + "black": "Black Bear" + }, + "white": "Polar Bear" + }, + "countries": [ + { "Europe": [ "Germany", "Italy", "France", "Spain" ]}, + { "Asia": [ "China", "Japan", "India"] }, + { "Americas": { + "S. America": [ "Brazil", "Venezuela"], + "N. America": [ "United States [USA]", "Canada", "Mexico"] + } + }, + { "Africa": [ "Egypt", "Somalia", "S. Africa" ]} + ], + "colors": ["red", "blue", "yellow", "orange" ], + "some_text": "Just a plain old string", + "another.text": "Another plain old string", + "frog['2']": "Red-eyed Tree Frog", + "owl[3]": "Great Horned Owl", + "$.xxx": "Looks like JSONPATH, but actually plain old string", + "$.": "Looks like JSONPATH prefix, but actually plain old string", + "$abc": "Starts with JSONPATH root char, but just a string", + "ibm.com": { + "g11n.pipeline.title": "Globalization Pipeline" + } +} diff --git a/test/gp-res-filter.d/merge-output.json b/test/gp-res-filter.d/merge-output.json new file mode 100644 index 0000000..5608055 --- /dev/null +++ b/test/gp-res-filter.d/merge-output.json @@ -0,0 +1,5 @@ +{ + "bear 1": "Brown Bear - translated", + "frog 2": "Red-eyed Tree Frog - translated", + "owl 3": "Great Horned Owl - translated" +} diff --git a/test/gp-res-filter.d/other-input.json b/test/gp-res-filter.d/other-input.json new file mode 100644 index 0000000..affe75a --- /dev/null +++ b/test/gp-res-filter.d/other-input.json @@ -0,0 +1,6 @@ +{ + "hello": { + "1": "Firstly", + "two": "Secondly" + } +} diff --git a/test/gp-res-filter.d/output.json b/test/gp-res-filter.d/output.json new file mode 100644 index 0000000..93f8f01 --- /dev/null +++ b/test/gp-res-filter.d/output.json @@ -0,0 +1 @@ +[{"key":"$.bears.grizzly.brown","value":"Brown Bear","sequenceNumber":1},{"key":"$.bears.grizzly.black","value":"Black Bear","sequenceNumber":2},{"key":"$.bears.white","value":"Polar Bear","sequenceNumber":3},{"key":"$.countries[0].Europe[0]","value":"Germany","sequenceNumber":4},{"key":"$.countries[0].Europe[1]","value":"Italy","sequenceNumber":5},{"key":"$.countries[0].Europe[2]","value":"France","sequenceNumber":6},{"key":"$.countries[0].Europe[3]","value":"Spain","sequenceNumber":7},{"key":"$.countries[1].Asia[0]","value":"China","sequenceNumber":8},{"key":"$.countries[1].Asia[1]","value":"Japan","sequenceNumber":9},{"key":"$.countries[1].Asia[2]","value":"India","sequenceNumber":10},{"key":"$.countries[2].Americas[\u0027S. America\u0027][0]","value":"Brazil","sequenceNumber":11},{"key":"$.countries[2].Americas[\u0027S. America\u0027][1]","value":"Venezuela","sequenceNumber":12},{"key":"$.countries[2].Americas[\u0027N. America\u0027][0]","value":"United States [USA]","sequenceNumber":13},{"key":"$.countries[2].Americas[\u0027N. America\u0027][1]","value":"Canada","sequenceNumber":14},{"key":"$.countries[2].Americas[\u0027N. America\u0027][2]","value":"Mexico","sequenceNumber":15},{"key":"$.countries[3].Africa[0]","value":"Egypt","sequenceNumber":16},{"key":"$.countries[3].Africa[1]","value":"Somalia","sequenceNumber":17},{"key":"$.countries[3].Africa[2]","value":"S. Africa","sequenceNumber":18},{"key":"$.colors[0]","value":"red","sequenceNumber":19},{"key":"$.colors[1]","value":"blue","sequenceNumber":20},{"key":"$.colors[2]","value":"yellow","sequenceNumber":21},{"key":"$.colors[3]","value":"orange","sequenceNumber":22},{"key":"some_text","value":"Just a plain old string","sequenceNumber":23},{"key":"another.text","value":"Another plain old string","sequenceNumber":24},{"key":"frog[\u00272\u0027]","value":"Red-eyed Tree Frog","sequenceNumber":25},{"key":"owl[3]","value":"Great Horned Owl","sequenceNumber":26},{"key":"$[\u0027$.xxx\u0027]","value":"Looks like JSONPATH, but actually plain old string","sequenceNumber":27},{"key":"$[\u0027$.\u0027]","value":"Looks like JSONPATH prefix, but actually plain old string","sequenceNumber":28},{"key":"$abc","value":"Starts with JSONPATH root char, but just a string","sequenceNumber":29},{"key":"$[\u0027ibm.com\u0027][\u0027g11n.pipeline.title\u0027]","value":"Globalization Pipeline","sequenceNumber":30}] \ No newline at end of file diff --git a/test/gp-res-filter.d/testSplitKeys.json b/test/gp-res-filter.d/testSplitKeys.json new file mode 100644 index 0000000..7b6b0ae --- /dev/null +++ b/test/gp-res-filter.d/testSplitKeys.json @@ -0,0 +1,432 @@ +{ + "$.firstly.1": [ + { + "keyValue": "firstly", + "keyType": "BEGIN_OBJECT" + }, + { + "keyValue": "1", + "keyType": "BEGIN_OBJECT" + } + ], + "$.bears.grizzly.black": [ + { + "keyValue": "bears", + "keyType": "BEGIN_OBJECT" + }, + { + "keyValue": "grizzly", + "keyType": "BEGIN_OBJECT" + }, + { + "keyValue": "black", + "keyType": "BEGIN_OBJECT" + } + ], + "$.bears.grizzly.brown": [ + { + "keyValue": "bears", + "keyType": "BEGIN_OBJECT" + }, + { + "keyValue": "grizzly", + "keyType": "BEGIN_OBJECT" + }, + { + "keyValue": "brown", + "keyType": "BEGIN_OBJECT" + } + ], + "$.bears.white": [ + { + "keyValue": "bears", + "keyType": "BEGIN_OBJECT" + }, + { + "keyValue": "white", + "keyType": "BEGIN_OBJECT" + } + ], + "$.colors[0]": [ + { + "keyValue": "colors", + "keyType": "BEGIN_OBJECT" + }, + { + "keyValue": "0", + "keyType": "BEGIN_ARRAY" + } + ], + "$.colors[1]": [ + { + "keyValue": "colors", + "keyType": "BEGIN_OBJECT" + }, + { + "keyValue": "1", + "keyType": "BEGIN_ARRAY" + } + ], + "$.colors[2]": [ + { + "keyValue": "colors", + "keyType": "BEGIN_OBJECT" + }, + { + "keyValue": "2", + "keyType": "BEGIN_ARRAY" + } + ], + "$.colors[3]": [ + { + "keyValue": "colors", + "keyType": "BEGIN_OBJECT" + }, + { + "keyValue": "3", + "keyType": "BEGIN_ARRAY" + } + ], + "$.countries[0].Europe[0]": [ + { + "keyValue": "countries", + "keyType": "BEGIN_OBJECT" + }, + { + "keyValue": "0", + "keyType": "BEGIN_ARRAY" + }, + { + "keyValue": "Europe", + "keyType": "BEGIN_OBJECT" + }, + { + "keyValue": "0", + "keyType": "BEGIN_ARRAY" + } + ], + "$.countries[0].Europe[1]": [ + { + "keyValue": "countries", + "keyType": "BEGIN_OBJECT" + }, + { + "keyValue": "0", + "keyType": "BEGIN_ARRAY" + }, + { + "keyValue": "Europe", + "keyType": "BEGIN_OBJECT" + }, + { + "keyValue": "1", + "keyType": "BEGIN_ARRAY" + } + ], + "$.countries[0].Europe[2]": [ + { + "keyValue": "countries", + "keyType": "BEGIN_OBJECT" + }, + { + "keyValue": "0", + "keyType": "BEGIN_ARRAY" + }, + { + "keyValue": "Europe", + "keyType": "BEGIN_OBJECT" + }, + { + "keyValue": "2", + "keyType": "BEGIN_ARRAY" + } + ], + "$.countries[0].Europe[3]": [ + { + "keyValue": "countries", + "keyType": "BEGIN_OBJECT" + }, + { + "keyValue": "0", + "keyType": "BEGIN_ARRAY" + }, + { + "keyValue": "Europe", + "keyType": "BEGIN_OBJECT" + }, + { + "keyValue": "3", + "keyType": "BEGIN_ARRAY" + } + ], + "$.countries[1].Asia[0]": [ + { + "keyValue": "countries", + "keyType": "BEGIN_OBJECT" + }, + { + "keyValue": "1", + "keyType": "BEGIN_ARRAY" + }, + { + "keyValue": "Asia", + "keyType": "BEGIN_OBJECT" + }, + { + "keyValue": "0", + "keyType": "BEGIN_ARRAY" + } + ], + "$.countries[1].Asia[1]": [ + { + "keyValue": "countries", + "keyType": "BEGIN_OBJECT" + }, + { + "keyValue": "1", + "keyType": "BEGIN_ARRAY" + }, + { + "keyValue": "Asia", + "keyType": "BEGIN_OBJECT" + }, + { + "keyValue": "1", + "keyType": "BEGIN_ARRAY" + } + ], + "$.countries[1].Asia[2]": [ + { + "keyValue": "countries", + "keyType": "BEGIN_OBJECT" + }, + { + "keyValue": "1", + "keyType": "BEGIN_ARRAY" + }, + { + "keyValue": "Asia", + "keyType": "BEGIN_OBJECT" + }, + { + "keyValue": "2", + "keyType": "BEGIN_ARRAY" + } + ], + "$.countries[2].Americas['N. America'][0]": [ + { + "keyValue": "countries", + "keyType": "BEGIN_OBJECT" + }, + { + "keyValue": "2", + "keyType": "BEGIN_ARRAY" + }, + { + "keyValue": "Americas", + "keyType": "BEGIN_OBJECT" + }, + { + "keyValue": "N. America", + "keyType": "BEGIN_OBJECT" + }, + { + "keyValue": "0", + "keyType": "BEGIN_ARRAY" + } + ], + "$.countries[2].Americas['N. America'][1]": [ + { + "keyValue": "countries", + "keyType": "BEGIN_OBJECT" + }, + { + "keyValue": "2", + "keyType": "BEGIN_ARRAY" + }, + { + "keyValue": "Americas", + "keyType": "BEGIN_OBJECT" + }, + { + "keyValue": "N. America", + "keyType": "BEGIN_OBJECT" + }, + { + "keyValue": "1", + "keyType": "BEGIN_ARRAY" + } + ], + "$.countries[2].Americas['N. America'][2]": [ + { + "keyValue": "countries", + "keyType": "BEGIN_OBJECT" + }, + { + "keyValue": "2", + "keyType": "BEGIN_ARRAY" + }, + { + "keyValue": "Americas", + "keyType": "BEGIN_OBJECT" + }, + { + "keyValue": "N. America", + "keyType": "BEGIN_OBJECT" + }, + { + "keyValue": "2", + "keyType": "BEGIN_ARRAY" + } + ], + "$.countries[2].Americas['S. America'][0]": [ + { + "keyValue": "countries", + "keyType": "BEGIN_OBJECT" + }, + { + "keyValue": "2", + "keyType": "BEGIN_ARRAY" + }, + { + "keyValue": "Americas", + "keyType": "BEGIN_OBJECT" + }, + { + "keyValue": "S. America", + "keyType": "BEGIN_OBJECT" + }, + { + "keyValue": "0", + "keyType": "BEGIN_ARRAY" + } + ], + "$.countries[2].Americas['S. America'][1]": [ + { + "keyValue": "countries", + "keyType": "BEGIN_OBJECT" + }, + { + "keyValue": "2", + "keyType": "BEGIN_ARRAY" + }, + { + "keyValue": "Americas", + "keyType": "BEGIN_OBJECT" + }, + { + "keyValue": "S. America", + "keyType": "BEGIN_OBJECT" + }, + { + "keyValue": "1", + "keyType": "BEGIN_ARRAY" + } + ], + "$.countries[3].Africa[0]": [ + { + "keyValue": "countries", + "keyType": "BEGIN_OBJECT" + }, + { + "keyValue": "3", + "keyType": "BEGIN_ARRAY" + }, + { + "keyValue": "Africa", + "keyType": "BEGIN_OBJECT" + }, + { + "keyValue": "0", + "keyType": "BEGIN_ARRAY" + } + ], + "$.countries[3].Africa[1]": [ + { + "keyValue": "countries", + "keyType": "BEGIN_OBJECT" + }, + { + "keyValue": "3", + "keyType": "BEGIN_ARRAY" + }, + { + "keyValue": "Africa", + "keyType": "BEGIN_OBJECT" + }, + { + "keyValue": "1", + "keyType": "BEGIN_ARRAY" + } + ], + "$.countries[3].Africa[2]": [ + { + "keyValue": "countries", + "keyType": "BEGIN_OBJECT" + }, + { + "keyValue": "3", + "keyType": "BEGIN_ARRAY" + }, + { + "keyValue": "Africa", + "keyType": "BEGIN_OBJECT" + }, + { + "keyValue": "2", + "keyType": "BEGIN_ARRAY" + } + ], + "$['$.']": [ + { + "keyValue": "$.", + "keyType": "BEGIN_OBJECT" + } + ], + "$['$.xxx']": [ + { + "keyValue": "$.xxx", + "keyType": "BEGIN_OBJECT" + } + ], + "$['ibm.com']['g11n.pipeline.title']": [ + { + "keyValue": "ibm.com", + "keyType": "BEGIN_OBJECT" + }, + { + "keyValue": "g11n.pipeline.title", + "keyType": "BEGIN_OBJECT" + } + ], + "$abc": [ + { + "keyValue": "$abc", + "keyType": "BEGIN_OBJECT" + } + ], + "another.text": [ + { + "keyValue": "another.text", + "keyType": "BEGIN_OBJECT" + } + ], + "frog['2']": [ + { + "keyValue": "frog['2']", + "keyType": "BEGIN_OBJECT" + } + ], + "owl[3]": [ + { + "keyValue": "owl[3]", + "keyType": "BEGIN_OBJECT" + } + ], + "some_text": [ + { + "keyValue": "some_text", + "keyType": "BEGIN_OBJECT" + } + ] +} \ No newline at end of file diff --git a/test/gp-res-filter.d/write-output.json b/test/gp-res-filter.d/write-output.json new file mode 100644 index 0000000..a3e6001 --- /dev/null +++ b/test/gp-res-filter.d/write-output.json @@ -0,0 +1,62 @@ +{ + "bears": { + "grizzly": { + "brown": "Brown Bear - XL", + "black": "Black Bear - XL" + }, + "white": "Polar Bear - XL" + }, + "countries": [ + { + "Europe": [ + "Germany - XL", + "Italy - XL", + "France - XL", + "Spain - XL" + ] + }, + { + "Asia": [ + "China - XL", + "Japan - XL", + "India - XL" + ] + }, + { + "Americas": { + "S. America": [ + "Brazil - XL", + "Venezuela - XL" + ], + "N. America": [ + "United States [USA] - XL", + "Canada - XL", + "Mexico - XL" + ] + } + }, + { + "Africa": [ + "Egypt - XL", + "Somalia - XL", + "S. Africa - XL" + ] + } + ], + "colors": [ + "red - XL", + "blue - XL", + "yellow - XL", + "orange - XL" + ], + "some_text": "Just a plain old string - XL", + "another.text": "Another plain old string - XL", + "frog['2']": "Red-eyed Tree Frog - XL", + "owl[3]": "Great Horned Owl - XL", + "$.xxx": "Looks like JSONPATH, but actually plain old string - XL", + "$.": "Looks like JSONPATH prefix, but actually plain old string - XL", + "$abc": "Starts with JSONPATH root char, but just a string - XL", + "ibm.com": { + "g11n.pipeline.title": "Globalization Pipeline - XL" + } +} From b98283eb942ab1051fa599c703f795e70dcf61dd Mon Sep 17 00:00:00 2001 From: "Steven R. Loomis" Date: Tue, 10 Jul 2018 15:31:41 -0700 Subject: [PATCH 2/8] fix vulnerable packages --- package-lock.json | 2105 ++++++++++++++++++++------------------------- package.json | 10 +- 2 files changed, 936 insertions(+), 1179 deletions(-) diff --git a/package-lock.json b/package-lock.json index 19064a4..6f0dc3e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -4,6 +4,129 @@ "lockfileVersion": 1, "requires": true, "dependencies": { + "@babel/code-frame": { + "version": "7.0.0-beta.51", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.0.0-beta.51.tgz", + "integrity": "sha1-vXHZsZKvl435FYKdOdQJRFZDmgw=", + "dev": true, + "requires": { + "@babel/highlight": "7.0.0-beta.51" + } + }, + "@babel/generator": { + "version": "7.0.0-beta.51", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.0.0-beta.51.tgz", + "integrity": "sha1-bHV1/952HQdIXgS67cA5LG2eMPY=", + "dev": true, + "requires": { + "@babel/types": "7.0.0-beta.51", + "jsesc": "^2.5.1", + "lodash": "^4.17.5", + "source-map": "^0.5.0", + "trim-right": "^1.0.1" + }, + "dependencies": { + "source-map": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz", + "integrity": "sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=", + "dev": true + } + } + }, + "@babel/helper-function-name": { + "version": "7.0.0-beta.51", + "resolved": "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.0.0-beta.51.tgz", + "integrity": "sha1-IbSHSiJ8+Z7K/MMKkDAtpaJkBWE=", + "dev": true, + "requires": { + "@babel/helper-get-function-arity": "7.0.0-beta.51", + "@babel/template": "7.0.0-beta.51", + "@babel/types": "7.0.0-beta.51" + } + }, + "@babel/helper-get-function-arity": { + "version": "7.0.0-beta.51", + "resolved": "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.0.0-beta.51.tgz", + "integrity": "sha1-MoGy0EWvlcFyzpGyCCXYXqRnZBE=", + "dev": true, + "requires": { + "@babel/types": "7.0.0-beta.51" + } + }, + "@babel/helper-split-export-declaration": { + "version": "7.0.0-beta.51", + "resolved": "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.0.0-beta.51.tgz", + "integrity": "sha1-imw/ZsTSZTUvwHdIT59ugKUauXg=", + "dev": true, + "requires": { + "@babel/types": "7.0.0-beta.51" + } + }, + "@babel/highlight": { + "version": "7.0.0-beta.51", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.0.0-beta.51.tgz", + "integrity": "sha1-6IRK4loVlcz9QriWI7Q3bKBtIl0=", + "dev": true, + "requires": { + "chalk": "^2.0.0", + "esutils": "^2.0.2", + "js-tokens": "^3.0.0" + } + }, + "@babel/parser": { + "version": "7.0.0-beta.51", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.0.0-beta.51.tgz", + "integrity": "sha1-J87C30Cd9gr1gnDtj2qlVAnqhvY=", + "dev": true + }, + "@babel/template": { + "version": "7.0.0-beta.51", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.0.0-beta.51.tgz", + "integrity": "sha1-lgKkCuvPNXrpZ34lMu9fyBD1+/8=", + "dev": true, + "requires": { + "@babel/code-frame": "7.0.0-beta.51", + "@babel/parser": "7.0.0-beta.51", + "@babel/types": "7.0.0-beta.51", + "lodash": "^4.17.5" + } + }, + "@babel/traverse": { + "version": "7.0.0-beta.51", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.0.0-beta.51.tgz", + "integrity": "sha1-mB2vLOw0emIx06odnhgDsDqqpKg=", + "dev": true, + "requires": { + "@babel/code-frame": "7.0.0-beta.51", + "@babel/generator": "7.0.0-beta.51", + "@babel/helper-function-name": "7.0.0-beta.51", + "@babel/helper-split-export-declaration": "7.0.0-beta.51", + "@babel/parser": "7.0.0-beta.51", + "@babel/types": "7.0.0-beta.51", + "debug": "^3.1.0", + "globals": "^11.1.0", + "invariant": "^2.2.0", + "lodash": "^4.17.5" + } + }, + "@babel/types": { + "version": "7.0.0-beta.51", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.0.0-beta.51.tgz", + "integrity": "sha1-2AK3tUO1g2x3iqaReXq/APPZfqk=", + "dev": true, + "requires": { + "esutils": "^2.0.2", + "lodash": "^4.17.5", + "to-fast-properties": "^2.0.0" + } + }, + "@kyleshockey/object-assign-deep": { + "version": "0.4.2", + "resolved": "https://registry.npmjs.org/@kyleshockey/object-assign-deep/-/object-assign-deep-0.4.2.tgz", + "integrity": "sha1-hJAPDu/DcnmPR1G1JigwuCCJIuw=", + "dev": true + }, "JSONSelect": { "version": "0.4.0", "resolved": "https://registry.npmjs.org/JSONSelect/-/JSONSelect-0.4.0.tgz", @@ -149,9 +272,9 @@ "dev": true }, "assert-plus": { - "version": "0.2.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz", - "integrity": "sha1-104bh+ev/A24qttwIfP+SBAasjQ=", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", + "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", "dev": true }, "assertion-error": { @@ -173,9 +296,9 @@ "dev": true }, "aws-sign2": { - "version": "0.6.0", - "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz", - "integrity": "sha1-FDQt0428yU0OW4fXY81jYSwOeU8=", + "version": "0.7.0", + "resolved": "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.7.0.tgz", + "integrity": "sha1-tG6JCTSpWR8tL2+G1+ap8bP+dqg=", "dev": true }, "aws4": { @@ -219,12 +342,28 @@ } } }, + "babel-runtime": { + "version": "6.26.0", + "resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz", + "integrity": "sha1-llxwWGaOgrVde/4E/yM3vItWR/4=", + "dev": true, + "requires": { + "core-js": "^2.4.0", + "regenerator-runtime": "^0.11.0" + } + }, "balanced-match": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz", "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c=", "dev": true }, + "base64-js": { + "version": "1.3.0", + "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.3.0.tgz", + "integrity": "sha512-ccav/yGvoa80BQDljCxsmmQ3Xvx60/UpBIij5QN21W3wBi/hhIC9OoO+KLpu9IJTS9j4DRVJ3aDDF9cMSoa2lw==", + "dev": true + }, "bcrypt-pbkdf": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.2.tgz", @@ -241,15 +380,6 @@ "integrity": "sha1-9y12C+Cbf3bQjtj66Ysomo0F+rM=", "dev": true }, - "boom": { - "version": "2.10.1", - "resolved": "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz", - "integrity": "sha1-OciRjO/1eZ+D+UkqhI9iWt0Mdm8=", - "dev": true, - "requires": { - "hoek": "2.x.x" - } - }, "brace-expansion": { "version": "1.1.11", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", @@ -261,17 +391,27 @@ } }, "browser-stdout": { - "version": "1.3.0", - "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.0.tgz", - "integrity": "sha1-81HTKWnTL6XXpVZxVCY9korjvR8=", + "version": "1.3.1", + "resolved": "https://registry.npmjs.org/browser-stdout/-/browser-stdout-1.3.1.tgz", + "integrity": "sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==", "dev": true }, "btoa": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/btoa/-/btoa-1.2.1.tgz", - "integrity": "sha512-SB4/MIGlsiVkMcHmT+pSmIPoNDoHg+7cMzmt3Uxt628MTz2487DKSqK/fuhFBrkuqrYv5UCEnACpF4dTFNKc/g==", + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/btoa/-/btoa-1.1.2.tgz", + "integrity": "sha1-PkC4FmP4HS3WWWpMtxSo3BbPq+A=", "dev": true }, + "buffer": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/buffer/-/buffer-5.1.0.tgz", + "integrity": "sha512-YkIRgwsZwJWTnyQrsBTWefizHh+8GYj3kbL1BTiAQ/9pwpino0G7B2gp5tx/FUBqUlvtxV85KNR3mwfAtv15Yw==", + "dev": true, + "requires": { + "base64-js": "^1.0.2", + "ieee754": "^1.1.4" + } + }, "buffer-from": { "version": "1.1.0", "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.0.tgz", @@ -312,9 +452,9 @@ "optional": true }, "caseless": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.11.0.tgz", - "integrity": "sha1-cVuW6phBWTzDMGeSP17GDr2k99c=", + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz", + "integrity": "sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw=", "dev": true }, "catharsis": { @@ -536,9 +676,9 @@ } }, "commander": { - "version": "2.16.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.16.0.tgz", - "integrity": "sha512-sVXqklSaotK9at437sFlFpyOcJonxe0yST/AG9DkQKUdIE6IqGIMv4SfAQSKaJbSdVEJYItASCrBiVQHq1HQew==", + "version": "2.15.1", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.15.1.tgz", + "integrity": "sha512-VlfT9F3V0v+jr4yxPc5gg9s62/fIVWsd2Bk2iD435um1NlGMYdVCq+MjcXnhYq2icNOizHr1kK+5TI6H0Hy0ag==", "dev": true }, "common-sequence": { @@ -547,12 +687,6 @@ "integrity": "sha1-MOB/P49vf5s97oVPILLTnu4Ibeg=", "dev": true }, - "component-emitter": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.2.1.tgz", - "integrity": "sha1-E3kY1teCg/ffemt8WmPhQOaUJeY=", - "dev": true - }, "concat-map": { "version": "0.0.1", "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", @@ -588,10 +722,16 @@ } } }, - "cookiejar": { - "version": "2.1.2", - "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.2.tgz", - "integrity": "sha512-Mw+adcfzPxcPeI+0WlvRrr/3lGVO0bD75SxX6811cxSh1Wbxx7xZBGK1eVtDf6si8rg2lhnUjsVLMFMfbRIuwA==", + "cookie": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz", + "integrity": "sha1-5+Ch+e9DtMi6klxcWpboBtFoc7s=", + "dev": true + }, + "core-js": { + "version": "2.5.7", + "resolved": "https://registry.npmjs.org/core-js/-/core-js-2.5.7.tgz", + "integrity": "sha512-RszJCAxg/PP6uzXVXL6BsxSXx/B05oJAQ2vkJRjyjrEcNVycaqOmNb5OTxZPE3xa5gwZduqza6L9JOCenh/Ecw==", "dev": true }, "core-util-is": { @@ -601,34 +741,19 @@ "dev": true }, "coveralls": { - "version": "2.13.3", - "resolved": "https://registry.npmjs.org/coveralls/-/coveralls-2.13.3.tgz", - "integrity": "sha512-iiAmn+l1XqRwNLXhW8Rs5qHZRFMYp9ZIPjEOVRpC/c4so6Y/f4/lFi0FfR5B9cCqgyhkJ5cZmbvcVRfP8MHchw==", + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/coveralls/-/coveralls-3.0.2.tgz", + "integrity": "sha512-Tv0LKe/MkBOilH2v7WBiTBdudg2ChfGbdXafc/s330djpF3zKOmuehTeRwjXWc7pzfj9FrDUTA7tEx6Div8NFw==", "dev": true, "requires": { - "js-yaml": "3.6.1", - "lcov-parse": "0.0.10", - "log-driver": "1.2.5", - "minimist": "1.2.0", - "request": "2.79.0" + "growl": "~> 1.10.0", + "js-yaml": "^3.11.0", + "lcov-parse": "^0.0.10", + "log-driver": "^1.2.7", + "minimist": "^1.2.0", + "request": "^2.85.0" }, "dependencies": { - "esprima": { - "version": "2.7.3", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz", - "integrity": "sha1-luO3DVd59q1JzQMmc9HDEnZ7pYE=", - "dev": true - }, - "js-yaml": { - "version": "3.6.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.6.1.tgz", - "integrity": "sha1-bl/mfYsgXOTSL60Ft3geja3MSzA=", - "dev": true, - "requires": { - "argparse": "^1.0.7", - "esprima": "^2.6.0" - } - }, "minimist": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", @@ -637,6 +762,16 @@ } } }, + "cross-fetch": { + "version": "0.0.8", + "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-0.0.8.tgz", + "integrity": "sha1-Ae2U3EB98sAPGAf95wCnz6SKIFw=", + "dev": true, + "requires": { + "node-fetch": "1.7.3", + "whatwg-fetch": "2.0.3" + } + }, "cross-spawn": { "version": "6.0.5", "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.5.tgz", @@ -650,15 +785,6 @@ "which": "^1.2.9" } }, - "cryptiles": { - "version": "2.0.5", - "resolved": "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz", - "integrity": "sha1-O9/s3GCBR8HGcgL6KR59ylnqo7g=", - "dev": true, - "requires": { - "boom": "2.x.x" - } - }, "dashdash": { "version": "1.14.1", "resolved": "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz", @@ -666,14 +792,6 @@ "dev": true, "requires": { "assert-plus": "^1.0.0" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", - "dev": true - } } }, "debug": { @@ -709,6 +827,12 @@ } } }, + "deep-equal": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz", + "integrity": "sha1-9dJgKStmDghO/0zbyfCK0yR0SLU=", + "dev": true + }, "deep-extend": { "version": "0.6.0", "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", @@ -718,8 +842,7 @@ "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=", - "dev": true + "integrity": "sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=" }, "define-properties": { "version": "1.1.2", @@ -753,9 +876,9 @@ "dev": true }, "diff": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/diff/-/diff-3.2.0.tgz", - "integrity": "sha1-yc45Okt8vQsFinJck98pkCeGj/k=", + "version": "3.5.0", + "resolved": "https://registry.npmjs.org/diff/-/diff-3.5.0.tgz", + "integrity": "sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==", "dev": true }, "dmd": { @@ -814,6 +937,21 @@ "jsbn": "~0.1.0" } }, + "encode-3986": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/encode-3986/-/encode-3986-1.0.0.tgz", + "integrity": "sha1-lA1RSY+HQa3hhLda0UObMXwMemA=", + "dev": true + }, + "encoding": { + "version": "0.1.12", + "resolved": "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz", + "integrity": "sha1-U4tm8+5izRq1HsMjgp0flIDHS+s=", + "dev": true, + "requires": { + "iconv-lite": "~0.4.13" + } + }, "es-abstract": { "version": "1.12.0", "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.12.0.tgz", @@ -978,14 +1116,12 @@ "estraverse": { "version": "4.2.0", "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.2.0.tgz", - "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=", - "dev": true + "integrity": "sha1-De4/7TH81GlhjOc0IJn8GvoL2xM=" }, "esutils": { "version": "2.0.2", "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz", - "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=", - "dev": true + "integrity": "sha1-Cr9PHKpbyx96nYrMbepPqqBLrJs=" }, "extend": { "version": "3.0.1", @@ -1016,6 +1152,15 @@ "integrity": "sha1-ewUhjd+WZ79/Nwv3/bLLFf3Qqkk=", "dev": true }, + "fast-json-patch": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-json-patch/-/fast-json-patch-2.0.6.tgz", + "integrity": "sha1-hv/4+GYjkaqBlyKGTWMuYD5u5gU=", + "dev": true, + "requires": { + "deep-equal": "^1.0.1" + } + }, "fast-json-stable-stringify": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.0.0.tgz", @@ -1025,8 +1170,7 @@ "fast-levenshtein": { "version": "2.0.6", "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=", - "dev": true + "integrity": "sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=" }, "figures": { "version": "2.0.0", @@ -1103,22 +1247,16 @@ "dev": true }, "form-data": { - "version": "2.1.4", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.1.4.tgz", - "integrity": "sha1-M8GDrPGTJ27KqYFDpp6Uv+4XUNE=", + "version": "2.3.2", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-2.3.2.tgz", + "integrity": "sha1-SXBJi+YEwgwAXU9cI67NIda0kJk=", "dev": true, "requires": { "asynckit": "^0.4.0", - "combined-stream": "^1.0.5", + "combined-stream": "1.0.6", "mime-types": "^2.1.12" } }, - "formidable": { - "version": "1.2.1", - "resolved": "https://registry.npmjs.org/formidable/-/formidable-1.2.1.tgz", - "integrity": "sha512-Fs9VRguL0gqGHkXS5GQiMCr1VhZBxz0JnJs4JmMp/2jL18Fmbzvv7vOFRU+U8TBkHEE/CX1qDXzJplVULgsLeg==", - "dev": true - }, "fs-then-native": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/fs-then-native/-/fs-then-native-2.0.0.tgz", @@ -1144,27 +1282,21 @@ "dev": true }, "g11n-pipeline": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/g11n-pipeline/-/g11n-pipeline-1.5.1.tgz", - "integrity": "sha512-7Me1Fz7Um0h8OXBEOQfUFEssH9kiUOBBnYjXmKqey6K0SVHfVOdZNitwKG8F6z0i4e9ZFVH4O4Cq/GAXBHOZTQ==", - "dev": true, - "requires": { - "swagger-client": "2.1.x" - } - }, - "generate-function": { - "version": "2.0.0", - "resolved": "https://registry.npmjs.org/generate-function/-/generate-function-2.0.0.tgz", - "integrity": "sha1-aFj+fAlpt9TpCTM3ZHrHn2DfvnQ=", - "dev": true - }, - "generate-object-property": { - "version": "1.2.0", - "resolved": "https://registry.npmjs.org/generate-object-property/-/generate-object-property-1.2.0.tgz", - "integrity": "sha1-nA4cQDCM6AT0eDYYuTf6iPmdUNA=", + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/g11n-pipeline/-/g11n-pipeline-3.1.0.tgz", + "integrity": "sha512-gSSI/33hHMf+t/E23kLOIain3w47AlUuLjDPCqCALcXmcRjsbT8iJssrWwiSVJbgGhdZ/+MDoh89hC9BytM2Xw==", "dev": true, "requires": { - "is-property": "^1.0.0" + "minimist": "^1.2.0", + "swagger-client": "^3.8.3" + }, + "dependencies": { + "minimist": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz", + "integrity": "sha1-o1AIsg9BOD7sH7kU9M1d95omQoQ=", + "dev": true + } } }, "getpass": { @@ -1174,14 +1306,6 @@ "dev": true, "requires": { "assert-plus": "^1.0.0" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", - "dev": true - } } }, "github-markdown-css": { @@ -1240,16 +1364,10 @@ "integrity": "sha1-Dovf5NHduIVNZOBOp8AOKgJuVlg=", "dev": true }, - "graceful-readlink": { - "version": "1.0.1", - "resolved": "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz", - "integrity": "sha1-TK+tdrxi8C+gObL5Tpo906ORpyU=", - "dev": true - }, "growl": { - "version": "1.9.2", - "resolved": "https://registry.npmjs.org/growl/-/growl-1.9.2.tgz", - "integrity": "sha1-Dqd0NxXbjY3ixe3hd14bRayFwC8=", + "version": "1.10.5", + "resolved": "https://registry.npmjs.org/growl/-/growl-1.10.5.tgz", + "integrity": "sha512-qBr4OuELkhPenW6goKVXiv47US3clb3/IbuWF9KNKEijAy9oeHxU9IgzjvJhHkUzhaj7rOUD7+YGWqUjLp5oSA==", "dev": true }, "handlebars": { @@ -1281,39 +1399,45 @@ "integrity": "sha1-AGulPrvJ+Hs6MWz4evZBmdUyh0Y=", "dev": true }, + "har-schema": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz", + "integrity": "sha1-qUwiJOvKwEeCoNkDVSHyRzW37JI=", + "dev": true + }, "har-validator": { - "version": "2.0.6", - "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-2.0.6.tgz", - "integrity": "sha1-zcvAgYgmWtEZtqWnyKtw7s+10n0=", + "version": "5.0.3", + "resolved": "https://registry.npmjs.org/har-validator/-/har-validator-5.0.3.tgz", + "integrity": "sha1-ukAsJmGU8VlW7xXg/PJCmT9qff0=", "dev": true, "requires": { - "chalk": "^1.1.1", - "commander": "^2.9.0", - "is-my-json-valid": "^2.12.4", - "pinkie-promise": "^2.0.0" + "ajv": "^5.1.0", + "har-schema": "^2.0.0" }, "dependencies": { - "chalk": { - "version": "1.1.3", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-1.1.3.tgz", - "integrity": "sha1-qBFcVeSnAv5NFQq9OHKCKn4J/Jg=", + "ajv": { + "version": "5.5.2", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-5.5.2.tgz", + "integrity": "sha1-c7Xuyj+rZT49P5Qis0GtQiBdyWU=", "dev": true, "requires": { - "ansi-styles": "^2.2.1", - "escape-string-regexp": "^1.0.2", - "has-ansi": "^2.0.0", - "strip-ansi": "^3.0.0", - "supports-color": "^2.0.0" + "co": "^4.6.0", + "fast-deep-equal": "^1.0.0", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.3.0" } }, - "strip-ansi": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz", - "integrity": "sha1-ajhfuIU9lS1f8F0Oiq+UJ43GPc8=", - "dev": true, - "requires": { - "ansi-regex": "^2.0.0" - } + "fast-deep-equal": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-1.1.0.tgz", + "integrity": "sha1-wFNHeBfIa1HaqFPIHgWbcz0CNhQ=", + "dev": true + }, + "json-schema-traverse": { + "version": "0.3.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.3.1.tgz", + "integrity": "sha1-NJptRMU6Ud6JtAgFxdXlm0F9M0A=", + "dev": true } } }, @@ -1347,37 +1471,19 @@ "integrity": "sha1-uhqPGvKg/DllD1yFA2dwQSIGO0Q=", "dev": true }, - "hawk": { - "version": "3.1.3", - "resolved": "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz", - "integrity": "sha1-B4REvXwWQLD+VA0sm3PVlnjo4cQ=", - "dev": true, - "requires": { - "boom": "2.x.x", - "cryptiles": "2.x.x", - "hoek": "2.x.x", - "sntp": "1.x.x" - } - }, "he": { "version": "1.1.1", "resolved": "https://registry.npmjs.org/he/-/he-1.1.1.tgz", "integrity": "sha1-k0EP0hsAlzUVH4howvJx80J+I/0=", "dev": true }, - "hoek": { - "version": "2.16.3", - "resolved": "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz", - "integrity": "sha1-ILt0A9POo5jpHcRxCo/xuCdKJe0=", - "dev": true - }, "http-signature": { - "version": "1.1.1", - "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz", - "integrity": "sha1-33LiZwZs0Kxn+3at+OE0qPvPkb8=", + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz", + "integrity": "sha1-muzZJRFHcvPZW2WmCruPfBj7rOE=", "dev": true, "requires": { - "assert-plus": "^0.2.0", + "assert-plus": "^1.0.0", "jsprim": "^1.2.2", "sshpk": "^1.7.0" } @@ -1391,6 +1497,12 @@ "safer-buffer": ">= 2.1.2 < 3" } }, + "ieee754": { + "version": "1.1.12", + "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.1.12.tgz", + "integrity": "sha512-GguP+DRY+pJ3soyIiGPTvdiVXjZ+DbXOxGpXn3eMvNW4x4irjqXm4wHKscC+TfxSJ0yw/S1F24tqdMNsMZTiLA==", + "dev": true + }, "ignore": { "version": "3.3.10", "resolved": "https://registry.npmjs.org/ignore/-/ignore-3.3.10.tgz", @@ -1440,6 +1552,15 @@ "through": "^2.3.6" } }, + "invariant": { + "version": "2.2.4", + "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz", + "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==", + "dev": true, + "requires": { + "loose-envify": "^1.0.0" + } + }, "is-buffer": { "version": "1.1.6", "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", @@ -1464,25 +1585,12 @@ "integrity": "sha1-o7MKXE8ZkYMWeqq5O+764937ZU8=", "dev": true }, - "is-my-ip-valid": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-my-ip-valid/-/is-my-ip-valid-1.0.0.tgz", - "integrity": "sha512-gmh/eWXROncUzRnIa1Ubrt5b8ep/MGSnfAUI3aRp+sqTCs1tv1Isl8d8F6JmkN3dXKc3ehZMrtiPN9eL03NuaQ==", + "is-generator": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/is-generator/-/is-generator-1.0.3.tgz", + "integrity": "sha1-wUwhBX7TbjKNuANHlmxpP4hjifM=", "dev": true }, - "is-my-json-valid": { - "version": "2.17.2", - "resolved": "https://registry.npmjs.org/is-my-json-valid/-/is-my-json-valid-2.17.2.tgz", - "integrity": "sha512-IBhBslgngMQN8DDSppmgDv7RNrlFotuuDsKcrCP3+HbFaVivIBU7u9oiiErw8sH4ynx3+gOGQ3q2otkgiSi6kg==", - "dev": true, - "requires": { - "generate-function": "^2.0.0", - "generate-object-property": "^1.1.0", - "is-my-ip-valid": "^1.0.0", - "jsonpointer": "^4.0.0", - "xtend": "^4.0.0" - } - }, "is-path-cwd": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz", @@ -1513,12 +1621,6 @@ "integrity": "sha1-eaKp7OfwlugPNtKy87wWwf9L8/o=", "dev": true }, - "is-property": { - "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-property/-/is-property-1.0.2.tgz", - "integrity": "sha1-V/4cTkhHTt1lsJkR8msc1Ald2oQ=", - "dev": true - }, "is-regex": { "version": "1.0.4", "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz", @@ -1534,6 +1636,12 @@ "integrity": "sha512-qgDYXFSR5WvEfuS5dMj6oTMEbrrSaM0CrFk2Yiq/gXnBvD9pMa2jGXxyhGLfvhZpuMZe18CJpFxAt3CRs42NMg==", "dev": true }, + "is-stream": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz", + "integrity": "sha1-EtSj3U5o4Lec6428hBc66A2RykQ=", + "dev": true + }, "is-symbol": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz", @@ -1558,6 +1666,37 @@ "integrity": "sha1-6PvzdNxVb/iUehDcsFctYz8s+hA=", "dev": true }, + "isomorphic-form-data": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/isomorphic-form-data/-/isomorphic-form-data-0.0.1.tgz", + "integrity": "sha1-Am9ifgMrDNhBPsyHVZKLlKRosGI=", + "dev": true, + "requires": { + "form-data": "^1.0.0-rc3" + }, + "dependencies": { + "async": { + "version": "2.6.1", + "resolved": "https://registry.npmjs.org/async/-/async-2.6.1.tgz", + "integrity": "sha512-fNEiL2+AZt6AlAw/29Cr0UDe4sRAHCpEHh54WMz+Bb7QfNcFw4h3loofyJpLeQs4Yx7yuqu/2dLgM5hKOs6HlQ==", + "dev": true, + "requires": { + "lodash": "^4.17.10" + } + }, + "form-data": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.1.tgz", + "integrity": "sha1-rjFduaSQf6BlUCMEpm13M0de43w=", + "dev": true, + "requires": { + "async": "^2.0.1", + "combined-stream": "^1.0.5", + "mime-types": "^2.1.11" + } + } + } + }, "isstream": { "version": "0.1.2", "resolved": "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz", @@ -1651,10 +1790,31 @@ } } }, - "jison": { - "version": "0.4.13", - "resolved": "https://registry.npmjs.org/jison/-/jison-0.4.13.tgz", - "integrity": "sha1-kEFwfWIkE2f1iDRTK58ZwsNvrHg=", + "istanbul-lib-coverage": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz", + "integrity": "sha512-nPvSZsVlbG9aLhZYaC3Oi1gT/tpyo3Yt5fNyf6NmcKIayz4VV/txxJFFKAK/gU4dcNn8ehsanBbVHVl0+amOLA==", + "dev": true + }, + "istanbul-lib-instrument": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-2.3.1.tgz", + "integrity": "sha512-h9Vg3nfbxrF0PK0kZiNiMAyL8zXaLiBP/BXniaKSwVvAi1TaumYV2b0wPdmy1CRX3irYbYD1p4Wjbv4uyECiiQ==", + "dev": true, + "requires": { + "@babel/generator": "7.0.0-beta.51", + "@babel/parser": "7.0.0-beta.51", + "@babel/template": "7.0.0-beta.51", + "@babel/traverse": "7.0.0-beta.51", + "@babel/types": "7.0.0-beta.51", + "istanbul-lib-coverage": "^2.0.1", + "semver": "^5.5.0" + } + }, + "jison": { + "version": "0.4.13", + "resolved": "https://registry.npmjs.org/jison/-/jison-0.4.13.tgz", + "integrity": "sha1-kEFwfWIkE2f1iDRTK58ZwsNvrHg=", "requires": { "JSONSelect": "0.4.0", "cjson": "~0.2.1", @@ -1849,6 +2009,12 @@ "walk-back": "^3.0.0" } }, + "jsesc": { + "version": "2.5.1", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.1.tgz", + "integrity": "sha1-5CGiqOINawgZ3yiQj3glJrlt0f4=", + "dev": true + }, "json-schema": { "version": "0.2.3", "resolved": "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz", @@ -1873,20 +2039,14 @@ "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=", "dev": true }, - "json3": { - "version": "3.3.2", - "resolved": "https://registry.npmjs.org/json3/-/json3-3.3.2.tgz", - "integrity": "sha1-PAQ0dD35Pi9cQq7nsZvLSDV19OE=", - "dev": true - }, "jsonpath": { - "version": "0.2.12", - "resolved": "https://registry.npmjs.org/jsonpath/-/jsonpath-0.2.12.tgz", - "integrity": "sha1-W/nZEftGFsHjNwvs658NskrjTNI=", + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/jsonpath/-/jsonpath-1.0.0.tgz", + "integrity": "sha1-Rc2dTE0NaCXZC9fkD4PxGCsT3Qc=", "requires": { "esprima": "1.2.2", "jison": "0.4.13", - "static-eval": "0.2.3", + "static-eval": "2.0.0", "underscore": "1.7.0" }, "dependencies": { @@ -1897,12 +2057,6 @@ } } }, - "jsonpointer": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/jsonpointer/-/jsonpointer-4.0.1.tgz", - "integrity": "sha1-T9kss04OnbPInIYi7PUfm5eMbLk=", - "dev": true - }, "jsprim": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", @@ -1913,14 +2067,6 @@ "extsprintf": "1.3.0", "json-schema": "0.2.3", "verror": "1.10.0" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", - "dev": true - } } }, "kind-of": { @@ -1958,7 +2104,6 @@ "version": "0.3.0", "resolved": "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz", "integrity": "sha1-OwmSTt+fCDwEkP3UwLxEIeBHZO4=", - "dev": true, "requires": { "prelude-ls": "~1.1.2", "type-check": "~0.3.2" @@ -1975,80 +2120,6 @@ "integrity": "sha512-UejweD1pDoXu+AD825lWwp4ZGtSwgnpZxb3JDViD7StjQz+Nb/6l093lx4OQ0foGWNRoc19mWy7BzL+UAK2iVg==", "dev": true }, - "lodash-compat": { - "version": "3.10.2", - "resolved": "https://registry.npmjs.org/lodash-compat/-/lodash-compat-3.10.2.tgz", - "integrity": "sha1-xpQBKKnTD46QLNLPmf0Muk7PwYM=", - "dev": true - }, - "lodash._baseassign": { - "version": "3.2.0", - "resolved": "https://registry.npmjs.org/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz", - "integrity": "sha1-jDigmVAPIVrQnlnxci/QxSv+Ck4=", - "dev": true, - "requires": { - "lodash._basecopy": "^3.0.0", - "lodash.keys": "^3.0.0" - } - }, - "lodash._basecopy": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/lodash._basecopy/-/lodash._basecopy-3.0.1.tgz", - "integrity": "sha1-jaDmqHbPNEwK2KVIghEd08XHyjY=", - "dev": true - }, - "lodash._basecreate": { - "version": "3.0.3", - "resolved": "https://registry.npmjs.org/lodash._basecreate/-/lodash._basecreate-3.0.3.tgz", - "integrity": "sha1-G8ZhYU2qf8MRt9A78WgGoCE8+CE=", - "dev": true - }, - "lodash._getnative": { - "version": "3.9.1", - "resolved": "https://registry.npmjs.org/lodash._getnative/-/lodash._getnative-3.9.1.tgz", - "integrity": "sha1-VwvH3t5G1hzc3mh9ZdPuy6o6r/U=", - "dev": true - }, - "lodash._isiterateecall": { - "version": "3.0.9", - "resolved": "https://registry.npmjs.org/lodash._isiterateecall/-/lodash._isiterateecall-3.0.9.tgz", - "integrity": "sha1-UgOte6Ql+uhCRg5pbbnPPmqsBXw=", - "dev": true - }, - "lodash.create": { - "version": "3.1.1", - "resolved": "https://registry.npmjs.org/lodash.create/-/lodash.create-3.1.1.tgz", - "integrity": "sha1-1/KEnw29p+BGgruM1yqwIkYd6+c=", - "dev": true, - "requires": { - "lodash._baseassign": "^3.0.0", - "lodash._basecreate": "^3.0.0", - "lodash._isiterateecall": "^3.0.0" - } - }, - "lodash.isarguments": { - "version": "3.1.0", - "resolved": "https://registry.npmjs.org/lodash.isarguments/-/lodash.isarguments-3.1.0.tgz", - "integrity": "sha1-L1c9hcaiQon/AGY7SRwdM4/zRYo=", - "dev": true - }, - "lodash.isarray": { - "version": "3.0.4", - "resolved": "https://registry.npmjs.org/lodash.isarray/-/lodash.isarray-3.0.4.tgz", - "integrity": "sha1-eeTriMNqgSKvhvhEqpvNhRtfu1U=", - "dev": true - }, - "lodash.keys": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/lodash.keys/-/lodash.keys-3.1.2.tgz", - "integrity": "sha1-TbwEcrFWvlCgsoaFXRvQsMZWCYo=", - "dev": true, - "requires": { - "lodash._getnative": "^3.0.0", - "lodash.isarguments": "^3.0.0", - "lodash.isarray": "^3.0.0" - } - }, "lodash.omit": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/lodash.omit/-/lodash.omit-4.5.0.tgz", @@ -2068,9 +2139,9 @@ "dev": true }, "log-driver": { - "version": "1.2.5", - "resolved": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.5.tgz", - "integrity": "sha1-euTsJXMC/XkNVXyxDJcQDYV7AFY=", + "version": "1.2.7", + "resolved": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.7.tgz", + "integrity": "sha512-U7KCmLdqsGHBLeWqYlFA0V0Sl6P08EE1ZrmA9cxjUE0WVqT9qnyVDPz1kzpFEP0jdJuFnasWIfSd7fsaNXkpbg==", "dev": true }, "longest": { @@ -2079,6 +2150,15 @@ "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=", "dev": true }, + "loose-envify": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz", + "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==", + "dev": true, + "requires": { + "js-tokens": "^3.0.0 || ^4.0.0" + } + }, "lru-cache": { "version": "4.1.3", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.3.tgz", @@ -2095,18 +2175,6 @@ "integrity": "sha512-ea2eGWOqNxPcXv8dyERdSr/6FmzvWwzjMxpfGB/sbMccXoct+xY+YukPD+QTUZwyvK7BZwcr4m21WBOW41pAkg==", "dev": true }, - "methods": { - "version": "1.1.2", - "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", - "integrity": "sha1-VSmk1nZUE07cxSZmVoNbD4Ua/O4=", - "dev": true - }, - "mime": { - "version": "1.6.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", - "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", - "dev": true - }, "mime-db": { "version": "1.33.0", "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.33.0.tgz", @@ -2159,70 +2227,31 @@ "dev": true }, "mocha": { - "version": "3.5.3", - "resolved": "https://registry.npmjs.org/mocha/-/mocha-3.5.3.tgz", - "integrity": "sha512-/6na001MJWEtYxHOV1WLfsmR4YIynkUEhBwzsb+fk2qmQ3iqsi258l/Q2MWHJMImAcNpZ8DEdYAK72NHoIQ9Eg==", + "version": "5.2.0", + "resolved": "https://registry.npmjs.org/mocha/-/mocha-5.2.0.tgz", + "integrity": "sha512-2IUgKDhc3J7Uug+FxMXuqIyYzH7gJjXECKe/w43IGgQHTSj3InJi+yAA7T24L9bQMRKiUEHxEX37G5JpVUGLcQ==", "dev": true, "requires": { - "browser-stdout": "1.3.0", - "commander": "2.9.0", - "debug": "2.6.8", - "diff": "3.2.0", + "browser-stdout": "1.3.1", + "commander": "2.15.1", + "debug": "3.1.0", + "diff": "3.5.0", "escape-string-regexp": "1.0.5", - "glob": "7.1.1", - "growl": "1.9.2", + "glob": "7.1.2", + "growl": "1.10.5", "he": "1.1.1", - "json3": "3.3.2", - "lodash.create": "3.1.1", + "minimatch": "3.0.4", "mkdirp": "0.5.1", - "supports-color": "3.1.2" + "supports-color": "5.4.0" }, "dependencies": { - "commander": { - "version": "2.9.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.9.0.tgz", - "integrity": "sha1-nJkJQXbhIkDLItbFFGCYQA/g99Q=", - "dev": true, - "requires": { - "graceful-readlink": ">= 1.0.0" - } - }, - "debug": { - "version": "2.6.8", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.8.tgz", - "integrity": "sha1-5zFTHKLt4n0YgiJCfaF4IdaP9Pw=", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "glob": { - "version": "7.1.1", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz", - "integrity": "sha1-gFIR3wT6rxxjo2ADBs31reULLsg=", - "dev": true, - "requires": { - "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^3.0.2", - "once": "^1.3.0", - "path-is-absolute": "^1.0.0" - } - }, - "has-flag": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-1.0.0.tgz", - "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", - "dev": true - }, "supports-color": { - "version": "3.1.2", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-3.1.2.tgz", - "integrity": "sha1-cqJiiU2dQIuVbKBf83su2KbiotU=", + "version": "5.4.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", + "integrity": "sha512-zjaXglF5nnWpsq470jSv6P9DwPvgLkuapYmfDm3JWOm0vkNTVF2tI4UrN2r6jH1qM/uc/WtxYY1hYoA2dOKj5w==", "dev": true, "requires": { - "has-flag": "^1.0.0" + "has-flag": "^3.0.0" } } } @@ -2570,6 +2599,16 @@ "integrity": "sha512-2NpiFHqC87y/zFke0fC0spBXL3bBsoh/p5H1EFhshxjCR5+0g2d6BiXbUFz9v1sAcxsk2htp2eQnNIci2dIYcA==", "dev": true }, + "node-fetch": { + "version": "1.7.3", + "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-1.7.3.tgz", + "integrity": "sha512-NhZ4CsKx7cYm2vSrBAr2PvFOe6sWDf0UYLRqA6svUYg7+/TSfVAu49jYC4BvQ4Sms9SZgdqGBgroqfDhJdTyKQ==", + "dev": true, + "requires": { + "encoding": "^0.1.11", + "is-stream": "^1.0.1" + } + }, "nomnom": { "version": "1.5.2", "resolved": "https://registry.npmjs.org/nomnom/-/nomnom-1.5.2.tgz", @@ -2596,38 +2635,36 @@ } }, "nyc": { - "version": "10.3.2", - "resolved": "https://registry.npmjs.org/nyc/-/nyc-10.3.2.tgz", - "integrity": "sha1-8n9NkfKp2zbCT1dP9cbv/wIz3kY=", + "version": "13.0.0", + "resolved": "https://registry.npmjs.org/nyc/-/nyc-13.0.0.tgz", + "integrity": "sha512-aQo5UssY25uCJ6M3yNjem0C3KJ1z4IYLp9iR2KqRsuwAII1YofEnRDrHOzp/0Zk2YMYXXxuvWUzjr24i4nmfDA==", "dev": true, "requires": { "archy": "^1.0.0", "arrify": "^1.0.1", - "caching-transform": "^1.0.0", - "convert-source-map": "^1.3.0", + "caching-transform": "^1.0.1", + "convert-source-map": "^1.5.1", "debug-log": "^1.0.1", - "default-require-extensions": "^1.0.0", - "find-cache-dir": "^0.1.1", - "find-up": "^1.1.2", - "foreground-child": "^1.5.3", - "glob": "^7.0.6", - "istanbul-lib-coverage": "^1.1.0", - "istanbul-lib-hook": "^1.0.6", - "istanbul-lib-instrument": "^1.7.1", - "istanbul-lib-report": "^1.1.0", - "istanbul-lib-source-maps": "^1.2.0", - "istanbul-reports": "^1.1.0", - "md5-hex": "^1.2.0", - "merge-source-map": "^1.0.2", - "micromatch": "^2.3.11", - "mkdirp": "^0.5.0", - "resolve-from": "^2.0.0", - "rimraf": "^2.5.4", - "signal-exit": "^3.0.1", - "spawn-wrap": "1.2.4", - "test-exclude": "^4.1.0", - "yargs": "^7.1.0", - "yargs-parser": "^5.0.0" + "find-cache-dir": "^1.0.0", + "find-up": "^2.1.0", + "foreground-child": "^1.5.6", + "glob": "^7.1.2", + "istanbul-lib-coverage": "^2.0.0", + "istanbul-lib-hook": "^2.0.0", + "istanbul-lib-instrument": "^2.2.0", + "istanbul-lib-report": "^2.0.0", + "istanbul-lib-source-maps": "^2.0.0", + "istanbul-reports": "^1.5.0", + "make-dir": "^1.3.0", + "md5-hex": "^2.0.0", + "merge-source-map": "^1.1.0", + "resolve-from": "^4.0.0", + "rimraf": "^2.6.2", + "signal-exit": "^3.0.2", + "spawn-wrap": "^1.4.2", + "test-exclude": "^4.2.2", + "yargs": "11.1.0", + "yargs-parser": "^9.0.2" }, "dependencies": { "align-text": { @@ -2646,21 +2683,16 @@ "dev": true }, "ansi-regex": { - "version": "2.1.1", - "bundled": true, - "dev": true - }, - "ansi-styles": { - "version": "2.2.1", + "version": "3.0.0", "bundled": true, "dev": true }, "append-transform": { - "version": "0.4.0", + "version": "1.0.0", "bundled": true, "dev": true, "requires": { - "default-require-extensions": "^1.0.0" + "default-require-extensions": "^2.0.0" } }, "archy": { @@ -2668,24 +2700,6 @@ "bundled": true, "dev": true }, - "arr-diff": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "requires": { - "arr-flatten": "^1.0.1" - } - }, - "arr-flatten": { - "version": "1.0.3", - "bundled": true, - "dev": true - }, - "array-unique": { - "version": "0.2.1", - "bundled": true, - "dev": true - }, "arrify": { "version": "1.0.1", "bundled": true, @@ -2696,116 +2710,20 @@ "bundled": true, "dev": true }, - "babel-code-frame": { - "version": "6.22.0", - "bundled": true, - "dev": true, - "requires": { - "chalk": "^1.1.0", - "esutils": "^2.0.2", - "js-tokens": "^3.0.0" - } - }, - "babel-generator": { - "version": "6.24.1", - "bundled": true, - "dev": true, - "requires": { - "babel-messages": "^6.23.0", - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1", - "detect-indent": "^4.0.0", - "jsesc": "^1.3.0", - "lodash": "^4.2.0", - "source-map": "^0.5.0", - "trim-right": "^1.0.1" - } - }, - "babel-messages": { - "version": "6.23.0", - "bundled": true, - "dev": true, - "requires": { - "babel-runtime": "^6.22.0" - } - }, - "babel-runtime": { - "version": "6.23.0", - "bundled": true, - "dev": true, - "requires": { - "core-js": "^2.4.0", - "regenerator-runtime": "^0.10.0" - } - }, - "babel-template": { - "version": "6.24.1", - "bundled": true, - "dev": true, - "requires": { - "babel-runtime": "^6.22.0", - "babel-traverse": "^6.24.1", - "babel-types": "^6.24.1", - "babylon": "^6.11.0", - "lodash": "^4.2.0" - } - }, - "babel-traverse": { - "version": "6.24.1", - "bundled": true, - "dev": true, - "requires": { - "babel-code-frame": "^6.22.0", - "babel-messages": "^6.23.0", - "babel-runtime": "^6.22.0", - "babel-types": "^6.24.1", - "babylon": "^6.15.0", - "debug": "^2.2.0", - "globals": "^9.0.0", - "invariant": "^2.2.0", - "lodash": "^4.2.0" - } - }, - "babel-types": { - "version": "6.24.1", - "bundled": true, - "dev": true, - "requires": { - "babel-runtime": "^6.22.0", - "esutils": "^2.0.2", - "lodash": "^4.2.0", - "to-fast-properties": "^1.0.1" - } - }, - "babylon": { - "version": "6.17.0", - "bundled": true, - "dev": true - }, "balanced-match": { - "version": "0.4.2", + "version": "1.0.0", "bundled": true, "dev": true }, "brace-expansion": { - "version": "1.1.7", + "version": "1.1.11", "bundled": true, "dev": true, "requires": { - "balanced-match": "^0.4.1", + "balanced-match": "^1.0.0", "concat-map": "0.0.1" } }, - "braces": { - "version": "1.8.5", - "bundled": true, - "dev": true, - "requires": { - "expand-range": "^1.8.1", - "preserve": "^0.2.0", - "repeat-element": "^1.1.2" - } - }, "builtin-modules": { "version": "1.1.1", "bundled": true, @@ -2819,6 +2737,16 @@ "md5-hex": "^1.2.0", "mkdirp": "^0.5.1", "write-file-atomic": "^1.1.4" + }, + "dependencies": { + "md5-hex": { + "version": "1.3.0", + "bundled": true, + "dev": true, + "requires": { + "md5-o-matic": "^0.1.1" + } + } } }, "camelcase": { @@ -2837,18 +2765,6 @@ "lazy-cache": "^1.0.3" } }, - "chalk": { - "version": "1.1.3", - "bundled": true, - "dev": true, - "requires": { - "ansi-styles": "^2.2.1", - "escape-string-regexp": "^1.0.2", - "has-ansi": "^2.0.0", - "strip-ansi": "^3.0.0", - "supports-color": "^2.0.0" - } - }, "cliui": { "version": "2.1.0", "bundled": true, @@ -2884,12 +2800,7 @@ "dev": true }, "convert-source-map": { - "version": "1.5.0", - "bundled": true, - "dev": true - }, - "core-js": { - "version": "2.4.1", + "version": "1.5.1", "bundled": true, "dev": true }, @@ -2903,11 +2814,11 @@ } }, "debug": { - "version": "2.6.6", + "version": "3.1.0", "bundled": true, "dev": true, "requires": { - "ms": "0.7.3" + "ms": "2.0.0" } }, "debug-log": { @@ -2921,19 +2832,18 @@ "dev": true }, "default-require-extensions": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "strip-bom": "^2.0.0" - } - }, - "detect-indent": { - "version": "4.0.0", + "version": "2.0.0", "bundled": true, "dev": true, "requires": { - "repeating": "^2.0.0" + "strip-bom": "^3.0.0" + }, + "dependencies": { + "strip-bom": { + "version": "3.0.0", + "bundled": true, + "dev": true + } } }, "error-ex": { @@ -2944,87 +2854,48 @@ "is-arrayish": "^0.2.1" } }, - "escape-string-regexp": { - "version": "1.0.5", - "bundled": true, - "dev": true - }, - "esutils": { - "version": "2.0.2", - "bundled": true, - "dev": true - }, - "expand-brackets": { - "version": "0.1.5", - "bundled": true, - "dev": true, - "requires": { - "is-posix-bracket": "^0.1.0" - } - }, - "expand-range": { - "version": "1.8.2", - "bundled": true, - "dev": true, - "requires": { - "fill-range": "^2.1.0" - } - }, - "extglob": { - "version": "0.3.2", + "execa": { + "version": "0.7.0", "bundled": true, "dev": true, "requires": { - "is-extglob": "^1.0.0" - } - }, - "filename-regex": { - "version": "2.0.1", - "bundled": true, - "dev": true - }, - "fill-range": { - "version": "2.2.3", - "bundled": true, - "dev": true, - "requires": { - "is-number": "^2.1.0", - "isobject": "^2.0.0", - "randomatic": "^1.1.3", - "repeat-element": "^1.1.2", - "repeat-string": "^1.5.2" + "cross-spawn": "^5.0.1", + "get-stream": "^3.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" + }, + "dependencies": { + "cross-spawn": { + "version": "5.1.0", + "bundled": true, + "dev": true, + "requires": { + "lru-cache": "^4.0.1", + "shebang-command": "^1.2.0", + "which": "^1.2.9" + } + } } }, "find-cache-dir": { - "version": "0.1.1", + "version": "1.0.0", "bundled": true, "dev": true, "requires": { "commondir": "^1.0.1", - "mkdirp": "^0.5.1", - "pkg-dir": "^1.0.0" + "make-dir": "^1.0.0", + "pkg-dir": "^2.0.0" } }, "find-up": { - "version": "1.1.2", - "bundled": true, - "dev": true, - "requires": { - "path-exists": "^2.0.0", - "pinkie-promise": "^2.0.0" - } - }, - "for-in": { - "version": "1.0.2", - "bundled": true, - "dev": true - }, - "for-own": { - "version": "0.1.5", + "version": "2.1.0", "bundled": true, "dev": true, "requires": { - "for-in": "^1.0.1" + "locate-path": "^2.0.0" } }, "foreground-child": { @@ -3046,48 +2917,31 @@ "bundled": true, "dev": true }, + "get-stream": { + "version": "3.0.0", + "bundled": true, + "dev": true + }, "glob": { - "version": "7.1.1", + "version": "7.1.2", "bundled": true, "dev": true, "requires": { "fs.realpath": "^1.0.0", "inflight": "^1.0.4", "inherits": "2", - "minimatch": "^3.0.2", + "minimatch": "^3.0.4", "once": "^1.3.0", "path-is-absolute": "^1.0.0" } }, - "glob-base": { - "version": "0.3.0", - "bundled": true, - "dev": true, - "requires": { - "glob-parent": "^2.0.0", - "is-glob": "^2.0.0" - } - }, - "glob-parent": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "requires": { - "is-glob": "^2.0.0" - } - }, - "globals": { - "version": "9.17.0", - "bundled": true, - "dev": true - }, "graceful-fs": { "version": "4.1.11", "bundled": true, "dev": true }, "handlebars": { - "version": "4.0.8", + "version": "4.0.11", "bundled": true, "dev": true, "requires": { @@ -3107,21 +2961,13 @@ } } }, - "has-ansi": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "requires": { - "ansi-regex": "^2.0.0" - } - }, "has-flag": { - "version": "1.0.0", + "version": "3.0.0", "bundled": true, "dev": true }, "hosted-git-info": { - "version": "2.4.2", + "version": "2.6.0", "bundled": true, "dev": true }, @@ -3144,14 +2990,6 @@ "bundled": true, "dev": true }, - "invariant": { - "version": "2.2.2", - "bundled": true, - "dev": true, - "requires": { - "loose-envify": "^1.0.0" - } - }, "invert-kv": { "version": "1.0.0", "bundled": true, @@ -3163,7 +3001,7 @@ "dev": true }, "is-buffer": { - "version": "1.1.5", + "version": "1.1.6", "bundled": true, "dev": true }, @@ -3175,78 +3013,13 @@ "builtin-modules": "^1.0.0" } }, - "is-dotfile": { - "version": "1.0.2", - "bundled": true, - "dev": true - }, - "is-equal-shallow": { - "version": "0.1.3", - "bundled": true, - "dev": true, - "requires": { - "is-primitive": "^2.0.0" - } - }, - "is-extendable": { - "version": "0.1.1", - "bundled": true, - "dev": true - }, - "is-extglob": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "is-finite": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "requires": { - "number-is-nan": "^1.0.0" - } - }, "is-fullwidth-code-point": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "number-is-nan": "^1.0.0" - } - }, - "is-glob": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "requires": { - "is-extglob": "^1.0.0" - } - }, - "is-number": { - "version": "2.1.0", - "bundled": true, - "dev": true, - "requires": { - "kind-of": "^3.0.2" - } - }, - "is-posix-bracket": { - "version": "0.1.1", - "bundled": true, - "dev": true - }, - "is-primitive": { "version": "2.0.0", "bundled": true, "dev": true }, - "is-utf8": { - "version": "0.2.1", - "bundled": true, - "dev": true - }, - "isarray": { - "version": "1.0.0", + "is-stream": { + "version": "1.1.0", "bundled": true, "dev": true }, @@ -3255,94 +3028,63 @@ "bundled": true, "dev": true }, - "isobject": { - "version": "2.1.0", - "bundled": true, - "dev": true, - "requires": { - "isarray": "1.0.0" - } - }, "istanbul-lib-coverage": { - "version": "1.1.0", + "version": "2.0.0", "bundled": true, "dev": true }, "istanbul-lib-hook": { - "version": "1.0.6", + "version": "2.0.0", "bundled": true, "dev": true, "requires": { - "append-transform": "^0.4.0" + "append-transform": "^1.0.0" } }, - "istanbul-lib-instrument": { - "version": "1.7.1", + "istanbul-lib-report": { + "version": "2.0.0", "bundled": true, "dev": true, "requires": { - "babel-generator": "^6.18.0", - "babel-template": "^6.16.0", - "babel-traverse": "^6.18.0", - "babel-types": "^6.18.0", - "babylon": "^6.13.0", - "istanbul-lib-coverage": "^1.1.0", - "semver": "^5.3.0" + "istanbul-lib-coverage": "^2.0.0", + "make-dir": "^1.3.0", + "supports-color": "^5.4.0" } }, - "istanbul-lib-report": { - "version": "1.1.0", + "istanbul-lib-source-maps": { + "version": "2.0.0", "bundled": true, "dev": true, "requires": { - "istanbul-lib-coverage": "^1.1.0", - "mkdirp": "^0.5.1", - "path-parse": "^1.0.5", - "supports-color": "^3.1.2" + "debug": "^3.1.0", + "istanbul-lib-coverage": "^2.0.0", + "make-dir": "^1.3.0", + "rimraf": "^2.6.2", + "source-map": "^0.6.1" }, "dependencies": { - "supports-color": { - "version": "3.2.3", + "source-map": { + "version": "0.6.1", "bundled": true, - "dev": true, - "requires": { - "has-flag": "^1.0.0" - } + "dev": true } } }, - "istanbul-lib-source-maps": { - "version": "1.2.0", - "bundled": true, - "dev": true, - "requires": { - "debug": "^2.6.3", - "istanbul-lib-coverage": "^1.1.0", - "mkdirp": "^0.5.1", - "rimraf": "^2.6.1", - "source-map": "^0.5.3" - } - }, "istanbul-reports": { - "version": "1.1.0", + "version": "1.5.0", "bundled": true, "dev": true, "requires": { - "handlebars": "^4.0.3" + "handlebars": "^4.0.11" } }, - "js-tokens": { - "version": "3.0.1", - "bundled": true, - "dev": true - }, - "jsesc": { - "version": "1.3.0", + "json-parse-better-errors": { + "version": "1.0.2", "bundled": true, "dev": true }, "kind-of": { - "version": "3.2.0", + "version": "3.2.2", "bundled": true, "dev": true, "requires": { @@ -3363,47 +3105,53 @@ "invert-kv": "^1.0.0" } }, - "load-json-file": { - "version": "1.1.0", + "locate-path": { + "version": "2.0.0", "bundled": true, "dev": true, "requires": { - "graceful-fs": "^4.1.2", - "parse-json": "^2.2.0", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0", - "strip-bom": "^2.0.0" + "p-locate": "^2.0.0", + "path-exists": "^3.0.0" + }, + "dependencies": { + "path-exists": { + "version": "3.0.0", + "bundled": true, + "dev": true + } } }, - "lodash": { - "version": "4.17.4", - "bundled": true, - "dev": true - }, "longest": { "version": "1.0.1", "bundled": true, "dev": true }, - "loose-envify": { - "version": "1.3.1", + "lru-cache": { + "version": "4.1.3", "bundled": true, "dev": true, "requires": { - "js-tokens": "^3.0.0" + "pseudomap": "^1.0.2", + "yallist": "^2.1.2" } }, - "lru-cache": { - "version": "4.0.2", + "make-dir": { + "version": "1.3.0", "bundled": true, "dev": true, "requires": { - "pseudomap": "^1.0.1", - "yallist": "^2.0.0" + "pify": "^3.0.0" + }, + "dependencies": { + "pify": { + "version": "3.0.0", + "bundled": true, + "dev": true + } } }, "md5-hex": { - "version": "1.3.0", + "version": "2.0.0", "bundled": true, "dev": true, "requires": { @@ -3415,40 +3163,40 @@ "bundled": true, "dev": true }, - "merge-source-map": { - "version": "1.0.3", + "mem": { + "version": "1.1.0", "bundled": true, "dev": true, "requires": { - "source-map": "^0.5.3" + "mimic-fn": "^1.0.0" } }, - "micromatch": { - "version": "2.3.11", + "merge-source-map": { + "version": "1.1.0", "bundled": true, "dev": true, "requires": { - "arr-diff": "^2.0.0", - "array-unique": "^0.2.1", - "braces": "^1.8.2", - "expand-brackets": "^0.1.4", - "extglob": "^0.3.1", - "filename-regex": "^2.0.0", - "is-extglob": "^1.0.0", - "is-glob": "^2.0.1", - "kind-of": "^3.0.2", - "normalize-path": "^2.0.1", - "object.omit": "^2.0.0", - "parse-glob": "^3.0.4", - "regex-cache": "^0.4.2" + "source-map": "^0.6.1" + }, + "dependencies": { + "source-map": { + "version": "0.6.1", + "bundled": true, + "dev": true + } } }, + "mimic-fn": { + "version": "1.2.0", + "bundled": true, + "dev": true + }, "minimatch": { - "version": "3.0.3", + "version": "3.0.4", "bundled": true, "dev": true, "requires": { - "brace-expansion": "^1.0.0" + "brace-expansion": "^1.1.7" } }, "minimist": { @@ -3465,12 +3213,12 @@ } }, "ms": { - "version": "0.7.3", + "version": "2.0.0", "bundled": true, "dev": true }, "normalize-package-data": { - "version": "2.3.8", + "version": "2.4.0", "bundled": true, "dev": true, "requires": { @@ -3480,12 +3228,12 @@ "validate-npm-package-license": "^3.0.1" } }, - "normalize-path": { - "version": "2.1.1", + "npm-run-path": { + "version": "2.0.2", "bundled": true, "dev": true, "requires": { - "remove-trailing-separator": "^1.0.1" + "path-key": "^2.0.0" } }, "number-is-nan": { @@ -3493,20 +3241,6 @@ "bundled": true, "dev": true }, - "object-assign": { - "version": "4.1.1", - "bundled": true, - "dev": true - }, - "object.omit": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "requires": { - "for-own": "^0.1.4", - "is-extendable": "^0.1.1" - } - }, "once": { "version": "1.4.0", "bundled": true, @@ -3530,145 +3264,61 @@ "dev": true }, "os-locale": { - "version": "1.4.0", - "bundled": true, - "dev": true, - "requires": { - "lcid": "^1.0.0" - } - }, - "parse-glob": { - "version": "3.0.4", - "bundled": true, - "dev": true, - "requires": { - "glob-base": "^0.3.0", - "is-dotfile": "^1.0.0", - "is-extglob": "^1.0.0", - "is-glob": "^2.0.0" - } - }, - "parse-json": { - "version": "2.2.0", - "bundled": true, - "dev": true, - "requires": { - "error-ex": "^1.2.0" - } - }, - "path-exists": { "version": "2.1.0", "bundled": true, "dev": true, "requires": { - "pinkie-promise": "^2.0.0" + "execa": "^0.7.0", + "lcid": "^1.0.0", + "mem": "^1.1.0" } }, - "path-is-absolute": { - "version": "1.0.1", - "bundled": true, - "dev": true - }, - "path-parse": { - "version": "1.0.5", + "p-finally": { + "version": "1.0.0", "bundled": true, "dev": true }, - "path-type": { - "version": "1.1.0", + "p-limit": { + "version": "1.2.0", "bundled": true, "dev": true, "requires": { - "graceful-fs": "^4.1.2", - "pify": "^2.0.0", - "pinkie-promise": "^2.0.0" + "p-try": "^1.0.0" } }, - "pify": { - "version": "2.3.0", - "bundled": true, - "dev": true - }, - "pinkie": { - "version": "2.0.4", - "bundled": true, - "dev": true - }, - "pinkie-promise": { - "version": "2.0.1", + "p-locate": { + "version": "2.0.0", "bundled": true, "dev": true, "requires": { - "pinkie": "^2.0.0" + "p-limit": "^1.1.0" } }, - "pkg-dir": { + "p-try": { "version": "1.0.0", "bundled": true, - "dev": true, - "requires": { - "find-up": "^1.0.0" - } - }, - "preserve": { - "version": "0.2.0", - "bundled": true, "dev": true }, - "pseudomap": { - "version": "1.0.2", - "bundled": true, - "dev": true - }, - "randomatic": { - "version": "1.1.6", - "bundled": true, - "dev": true, - "requires": { - "is-number": "^2.0.2", - "kind-of": "^3.0.2" - } - }, - "read-pkg": { - "version": "1.1.0", - "bundled": true, - "dev": true, - "requires": { - "load-json-file": "^1.0.0", - "normalize-package-data": "^2.3.2", - "path-type": "^1.0.0" - } - }, - "read-pkg-up": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "requires": { - "find-up": "^1.0.0", - "read-pkg": "^1.0.0" - } + "path-is-absolute": { + "version": "1.0.1", + "bundled": true, + "dev": true }, - "regenerator-runtime": { - "version": "0.10.5", + "path-key": { + "version": "2.0.1", "bundled": true, "dev": true }, - "regex-cache": { - "version": "0.4.3", + "pkg-dir": { + "version": "2.0.0", "bundled": true, "dev": true, "requires": { - "is-equal-shallow": "^0.1.3", - "is-primitive": "^2.0.0" + "find-up": "^2.1.0" } }, - "remove-trailing-separator": { - "version": "1.0.1", - "bundled": true, - "dev": true - }, - "repeat-element": { - "version": "1.1.2", + "pseudomap": { + "version": "1.0.2", "bundled": true, "dev": true }, @@ -3677,14 +3327,6 @@ "bundled": true, "dev": true }, - "repeating": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "requires": { - "is-finite": "^1.0.0" - } - }, "require-directory": { "version": "2.1.1", "bundled": true, @@ -3696,7 +3338,7 @@ "dev": true }, "resolve-from": { - "version": "2.0.0", + "version": "4.0.0", "bundled": true, "dev": true }, @@ -3710,7 +3352,7 @@ } }, "rimraf": { - "version": "2.6.1", + "version": "2.6.2", "bundled": true, "dev": true, "requires": { @@ -3718,7 +3360,7 @@ } }, "semver": { - "version": "5.3.0", + "version": "5.5.0", "bundled": true, "dev": true }, @@ -3727,6 +3369,19 @@ "bundled": true, "dev": true }, + "shebang-command": { + "version": "1.2.0", + "bundled": true, + "dev": true, + "requires": { + "shebang-regex": "^1.0.0" + } + }, + "shebang-regex": { + "version": "1.0.0", + "bundled": true, + "dev": true + }, "signal-exit": { "version": "3.0.2", "bundled": true, @@ -3738,103 +3393,154 @@ "dev": true }, "source-map": { - "version": "0.5.6", + "version": "0.5.7", "bundled": true, - "dev": true + "dev": true, + "optional": true }, "spawn-wrap": { - "version": "1.2.4", + "version": "1.4.2", "bundled": true, "dev": true, "requires": { - "foreground-child": "^1.3.3", + "foreground-child": "^1.5.6", "mkdirp": "^0.5.0", "os-homedir": "^1.0.1", - "rimraf": "^2.3.3", - "signal-exit": "^2.0.0", - "which": "^1.2.4" - }, - "dependencies": { - "signal-exit": { - "version": "2.1.2", - "bundled": true, - "dev": true - } + "rimraf": "^2.6.2", + "signal-exit": "^3.0.2", + "which": "^1.3.0" } }, "spdx-correct": { - "version": "1.0.2", + "version": "3.0.0", "bundled": true, "dev": true, "requires": { - "spdx-license-ids": "^1.0.2" + "spdx-expression-parse": "^3.0.0", + "spdx-license-ids": "^3.0.0" } }, - "spdx-expression-parse": { - "version": "1.0.4", + "spdx-exceptions": { + "version": "2.1.0", "bundled": true, "dev": true }, + "spdx-expression-parse": { + "version": "3.0.0", + "bundled": true, + "dev": true, + "requires": { + "spdx-exceptions": "^2.1.0", + "spdx-license-ids": "^3.0.0" + } + }, "spdx-license-ids": { - "version": "1.2.2", + "version": "3.0.0", "bundled": true, "dev": true }, "string-width": { - "version": "1.0.2", + "version": "2.1.1", "bundled": true, "dev": true, "requires": { - "code-point-at": "^1.0.0", - "is-fullwidth-code-point": "^1.0.0", - "strip-ansi": "^3.0.0" + "is-fullwidth-code-point": "^2.0.0", + "strip-ansi": "^4.0.0" } }, "strip-ansi": { - "version": "3.0.1", + "version": "4.0.0", "bundled": true, "dev": true, "requires": { - "ansi-regex": "^2.0.0" + "ansi-regex": "^3.0.0" } }, - "strip-bom": { - "version": "2.0.0", + "strip-eof": { + "version": "1.0.0", "bundled": true, - "dev": true, - "requires": { - "is-utf8": "^0.2.0" - } + "dev": true }, "supports-color": { - "version": "2.0.0", + "version": "5.4.0", "bundled": true, - "dev": true + "dev": true, + "requires": { + "has-flag": "^3.0.0" + } }, "test-exclude": { - "version": "4.1.0", + "version": "4.2.2", "bundled": true, "dev": true, "requires": { "arrify": "^1.0.1", - "micromatch": "^2.3.11", - "object-assign": "^4.1.0", - "read-pkg-up": "^1.0.1", + "minimatch": "^3.0.4", + "read-pkg-up": "^3.0.0", "require-main-filename": "^1.0.1" + }, + "dependencies": { + "load-json-file": { + "version": "4.0.0", + "bundled": true, + "dev": true, + "requires": { + "graceful-fs": "^4.1.2", + "parse-json": "^4.0.0", + "pify": "^3.0.0", + "strip-bom": "^3.0.0" + } + }, + "parse-json": { + "version": "4.0.0", + "bundled": true, + "dev": true, + "requires": { + "error-ex": "^1.3.1", + "json-parse-better-errors": "^1.0.1" + } + }, + "path-type": { + "version": "3.0.0", + "bundled": true, + "dev": true, + "requires": { + "pify": "^3.0.0" + } + }, + "pify": { + "version": "3.0.0", + "bundled": true, + "dev": true + }, + "read-pkg": { + "version": "3.0.0", + "bundled": true, + "dev": true, + "requires": { + "load-json-file": "^4.0.0", + "normalize-package-data": "^2.3.2", + "path-type": "^3.0.0" + } + }, + "read-pkg-up": { + "version": "3.0.0", + "bundled": true, + "dev": true, + "requires": { + "find-up": "^2.0.0", + "read-pkg": "^3.0.0" + } + }, + "strip-bom": { + "version": "3.0.0", + "bundled": true, + "dev": true + } } }, - "to-fast-properties": { - "version": "1.0.3", - "bundled": true, - "dev": true - }, - "trim-right": { - "version": "1.0.1", - "bundled": true, - "dev": true - }, "uglify-js": { - "version": "2.8.22", + "version": "2.8.29", "bundled": true, "dev": true, "optional": true, @@ -3865,16 +3571,16 @@ "optional": true }, "validate-npm-package-license": { - "version": "3.0.1", + "version": "3.0.3", "bundled": true, "dev": true, "requires": { - "spdx-correct": "~1.0.0", - "spdx-expression-parse": "~1.0.0" + "spdx-correct": "^3.0.0", + "spdx-expression-parse": "^3.0.0" } }, "which": { - "version": "1.2.14", + "version": "1.3.1", "bundled": true, "dev": true, "requires": { @@ -3882,7 +3588,7 @@ } }, "which-module": { - "version": "1.0.0", + "version": "2.0.0", "bundled": true, "dev": true }, @@ -3904,6 +3610,39 @@ "requires": { "string-width": "^1.0.1", "strip-ansi": "^3.0.1" + }, + "dependencies": { + "ansi-regex": { + "version": "2.1.1", + "bundled": true, + "dev": true + }, + "is-fullwidth-code-point": { + "version": "1.0.0", + "bundled": true, + "dev": true, + "requires": { + "number-is-nan": "^1.0.0" + } + }, + "string-width": { + "version": "1.0.2", + "bundled": true, + "dev": true, + "requires": { + "code-point-at": "^1.0.0", + "is-fullwidth-code-point": "^1.0.0", + "strip-ansi": "^3.0.0" + } + }, + "strip-ansi": { + "version": "3.0.1", + "bundled": true, + "dev": true, + "requires": { + "ansi-regex": "^2.0.0" + } + } } }, "wrappy": { @@ -3932,52 +3671,59 @@ "dev": true }, "yargs": { - "version": "7.1.0", + "version": "11.1.0", "bundled": true, "dev": true, "requires": { - "camelcase": "^3.0.0", - "cliui": "^3.2.0", + "cliui": "^4.0.0", "decamelize": "^1.1.1", + "find-up": "^2.1.0", "get-caller-file": "^1.0.1", - "os-locale": "^1.4.0", - "read-pkg-up": "^1.0.1", + "os-locale": "^2.0.0", "require-directory": "^2.1.1", "require-main-filename": "^1.0.1", "set-blocking": "^2.0.0", - "string-width": "^1.0.2", - "which-module": "^1.0.0", + "string-width": "^2.0.0", + "which-module": "^2.0.0", "y18n": "^3.2.1", - "yargs-parser": "^5.0.0" + "yargs-parser": "^9.0.2" }, "dependencies": { "camelcase": { - "version": "3.0.0", + "version": "4.1.0", "bundled": true, "dev": true }, "cliui": { - "version": "3.2.0", + "version": "4.1.0", "bundled": true, "dev": true, "requires": { - "string-width": "^1.0.1", - "strip-ansi": "^3.0.1", + "string-width": "^2.1.1", + "strip-ansi": "^4.0.0", "wrap-ansi": "^2.0.0" } + }, + "yargs-parser": { + "version": "9.0.2", + "bundled": true, + "dev": true, + "requires": { + "camelcase": "^4.1.0" + } } } }, "yargs-parser": { - "version": "5.0.0", + "version": "9.0.2", "bundled": true, "dev": true, "requires": { - "camelcase": "^3.0.0" + "camelcase": "^4.1.0" }, "dependencies": { "camelcase": { - "version": "3.0.0", + "version": "4.1.0", "bundled": true, "dev": true } @@ -4061,7 +3807,6 @@ "version": "0.8.2", "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz", "integrity": "sha1-NkxeQJ0/TWMB1sC0wFu6UBgK62Q=", - "dev": true, "requires": { "deep-is": "~0.1.3", "fast-levenshtein": "~2.0.4", @@ -4095,6 +3840,12 @@ "integrity": "sha1-QRyttXTFoUDTpLGRDUDYDMn0C0A=", "dev": true }, + "performance-now": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz", + "integrity": "sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=", + "dev": true + }, "pify": { "version": "2.3.0", "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", @@ -4125,8 +3876,7 @@ "prelude-ls": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz", - "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=", - "dev": true + "integrity": "sha1-IZMqVJ9eUv/ZqCf1cOBL5iqX2lQ=" }, "process-nextick-args": { "version": "2.0.0", @@ -4158,16 +3908,22 @@ "integrity": "sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==", "dev": true }, - "q": { - "version": "1.5.1", - "resolved": "https://registry.npmjs.org/q/-/q-1.5.1.tgz", - "integrity": "sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=", + "qs": { + "version": "6.5.2", + "resolved": "https://registry.npmjs.org/qs/-/qs-6.5.2.tgz", + "integrity": "sha512-N5ZAX4/LxJmF+7wN74pUD6qAh9/wnvdQcjq9TZjevvXzSUo7bfmw91saqMjzGS2xq91/odN2dW/WOl7qQHNDGA==", + "dev": true + }, + "querystring": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz", + "integrity": "sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=", "dev": true }, - "qs": { - "version": "6.3.2", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.3.2.tgz", - "integrity": "sha1-51vV9uJoEioqDgvaYwslUMFmUCw=", + "querystring-browser": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/querystring-browser/-/querystring-browser-1.0.4.tgz", + "integrity": "sha1-8uNYgYQKgZvHsb9Zf68JeeZiLcY=", "dev": true }, "readable-stream": { @@ -4236,6 +3992,12 @@ "test-value": "^2.0.0" } }, + "regenerator-runtime": { + "version": "0.11.1", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz", + "integrity": "sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==", + "dev": true + }, "regexp.prototype.flags": { "version": "1.2.0", "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.2.0.tgz", @@ -4264,31 +4026,31 @@ "dev": true }, "request": { - "version": "2.79.0", - "resolved": "https://registry.npmjs.org/request/-/request-2.79.0.tgz", - "integrity": "sha1-Tf5b9r6LjNw3/Pk+BLZVd3InEN4=", + "version": "2.87.0", + "resolved": "https://registry.npmjs.org/request/-/request-2.87.0.tgz", + "integrity": "sha512-fcogkm7Az5bsS6Sl0sibkbhcKsnyon/jV1kF3ajGmF0c8HrttdKTPRT9hieOaQHA5HEq6r8OyWOo/o781C1tNw==", "dev": true, "requires": { - "aws-sign2": "~0.6.0", - "aws4": "^1.2.1", - "caseless": "~0.11.0", + "aws-sign2": "~0.7.0", + "aws4": "^1.6.0", + "caseless": "~0.12.0", "combined-stream": "~1.0.5", - "extend": "~3.0.0", + "extend": "~3.0.1", "forever-agent": "~0.6.1", - "form-data": "~2.1.1", - "har-validator": "~2.0.6", - "hawk": "~3.1.3", - "http-signature": "~1.1.0", + "form-data": "~2.3.1", + "har-validator": "~5.0.3", + "http-signature": "~1.2.0", "is-typedarray": "~1.0.0", "isstream": "~0.1.2", "json-stringify-safe": "~5.0.1", - "mime-types": "~2.1.7", - "oauth-sign": "~0.8.1", - "qs": "~6.3.0", - "stringstream": "~0.0.4", - "tough-cookie": "~2.3.0", - "tunnel-agent": "~0.4.1", - "uuid": "^3.0.0" + "mime-types": "~2.1.17", + "oauth-sign": "~0.8.2", + "performance-now": "^2.1.0", + "qs": "~6.5.1", + "safe-buffer": "^5.1.1", + "tough-cookie": "~2.3.3", + "tunnel-agent": "^0.6.0", + "uuid": "^3.1.0" } }, "require-uncached": { @@ -4440,15 +4202,6 @@ "is-fullwidth-code-point": "^2.0.0" } }, - "sntp": { - "version": "1.0.9", - "resolved": "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz", - "integrity": "sha1-ZUEYTMkK7qbG57NeJlkIJEPGYZg=", - "dev": true, - "requires": { - "hoek": "2.x.x" - } - }, "sort-array": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/sort-array/-/sort-array-2.0.0.tgz", @@ -4498,43 +4251,38 @@ "jsbn": "~0.1.0", "safer-buffer": "^2.0.2", "tweetnacl": "~0.14.0" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", - "dev": true - } } }, "static-eval": { - "version": "0.2.3", - "resolved": "https://registry.npmjs.org/static-eval/-/static-eval-0.2.3.tgz", - "integrity": "sha1-Aj8XrJ/uQm6niMEuo5IG3Bdfiyo=", + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/static-eval/-/static-eval-2.0.0.tgz", + "integrity": "sha512-6flshd3F1Gwm+Ksxq463LtFd1liC77N/PX1FVVc3OzL3hAmo2fwHFbuArkcfi7s9rTNsLEhcRmXGFZhlgy40uw==", "requires": { - "escodegen": "~0.0.24" + "escodegen": "^1.8.1" }, "dependencies": { "escodegen": { - "version": "0.0.28", - "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-0.0.28.tgz", - "integrity": "sha1-Dk/xcV8yh3XWyrUaxEpAbNer/9M=", + "version": "1.10.0", + "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-1.10.0.tgz", + "integrity": "sha512-fjUOf8johsv23WuIKdNQU4P9t9jhQ4Qzx6pC2uW890OloK3Zs1ZAoCNpg/2larNF501jLl3UNy0kIRcF6VI22g==", "requires": { - "esprima": "~1.0.2", - "estraverse": "~1.3.0", - "source-map": ">= 0.1.2" + "esprima": "^3.1.3", + "estraverse": "^4.2.0", + "esutils": "^2.0.2", + "optionator": "^0.8.1", + "source-map": "~0.6.1" } }, "esprima": { - "version": "1.0.4", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.0.4.tgz", - "integrity": "sha1-n1V+CPw7TSbs6d00+Pv0drYlha0=" + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-3.1.3.tgz", + "integrity": "sha1-/cpRzuYTOJXjyI1TXOSdv/YqRjM=" }, - "estraverse": { - "version": "1.3.2", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-1.3.2.tgz", - "integrity": "sha1-N8K4k+8T1yPydth41g2FNRUqbEI=" + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "optional": true } } }, @@ -4596,12 +4344,6 @@ "safe-buffer": "~5.1.0" } }, - "stringstream": { - "version": "0.0.6", - "resolved": "https://registry.npmjs.org/stringstream/-/stringstream-0.0.6.tgz", - "integrity": "sha512-87GEBAkegbBcweToUrdzf3eLhWNg06FJTebl4BVJz/JgWy8CvEr9dRtX5qWphiynMSQlxxi+QqN0z5T32SLlhA==", - "dev": true - }, "strip-ansi": { "version": "4.0.0", "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz", @@ -4625,46 +4367,6 @@ "integrity": "sha1-PFMZQukIwml8DsNEhYwobHygpgo=", "dev": true }, - "superagent": { - "version": "2.3.0", - "resolved": "https://registry.npmjs.org/superagent/-/superagent-2.3.0.tgz", - "integrity": "sha1-cDUpoHFOV+EjlZ3e+84ZOy5Q0RU=", - "dev": true, - "requires": { - "component-emitter": "^1.2.0", - "cookiejar": "^2.0.6", - "debug": "^2.2.0", - "extend": "^3.0.0", - "form-data": "1.0.0-rc4", - "formidable": "^1.0.17", - "methods": "^1.1.1", - "mime": "^1.3.4", - "qs": "^6.1.0", - "readable-stream": "^2.0.5" - }, - "dependencies": { - "debug": { - "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", - "dev": true, - "requires": { - "ms": "2.0.0" - } - }, - "form-data": { - "version": "1.0.0-rc4", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-1.0.0-rc4.tgz", - "integrity": "sha1-BaxrwiIntD5EYfSIFhVUaZ1Pi14=", - "dev": true, - "requires": { - "async": "^1.5.2", - "combined-stream": "^1.0.5", - "mime-types": "^2.1.10" - } - } - } - }, "supports-color": { "version": "2.0.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz", @@ -4672,17 +4374,37 @@ "dev": true }, "swagger-client": { - "version": "2.1.32", - "resolved": "https://registry.npmjs.org/swagger-client/-/swagger-client-2.1.32.tgz", - "integrity": "sha1-wkZIXgtZro0OAGvE49CIwLgXq/Y=", - "dev": true, - "requires": { - "btoa": "^1.1.2", - "cookiejar": "^2.0.1", - "js-yaml": "^3.3.0", - "lodash-compat": "^3.5.0", - "q": "^1.4.1", - "superagent": "^2.2" + "version": "3.8.8", + "resolved": "https://registry.npmjs.org/swagger-client/-/swagger-client-3.8.8.tgz", + "integrity": "sha1-/Vx/rZPMtGvIBmgREYZp6We9gGs=", + "dev": true, + "requires": { + "@kyleshockey/object-assign-deep": "^0.4.0", + "babel-runtime": "^6.26.0", + "btoa": "1.1.2", + "buffer": "^5.1.0", + "cookie": "^0.3.1", + "cross-fetch": "0.0.8", + "deep-extend": "^0.5.1", + "encode-3986": "^1.0.0", + "fast-json-patch": "^2.0.6", + "is-generator": "^1.0.3", + "isomorphic-form-data": "0.0.1", + "js-yaml": "^3.8.1", + "lodash": "^4.16.2", + "qs": "^6.3.0", + "querystring-browser": "^1.0.4", + "url": "^0.11.0", + "utf8-bytes": "0.0.1", + "utfstring": "^2.0.0" + }, + "dependencies": { + "deep-extend": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.5.1.tgz", + "integrity": "sha512-N8vBdOa+DF7zkRrDCsaOXoCs/E2fJfx9B9MrKnnSiHNh4ws7eSys6YQE4KvT1cecKmOASYQBhbKjeuDD9lT81w==", + "dev": true + } } }, "symbol-observable": { @@ -4772,6 +4494,12 @@ "os-tmpdir": "~1.0.2" } }, + "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=", + "dev": true + }, "tough-cookie": { "version": "2.3.4", "resolved": "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.4.tgz", @@ -4789,12 +4517,21 @@ } } }, - "tunnel-agent": { - "version": "0.4.3", - "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.4.3.tgz", - "integrity": "sha1-Y3PbdpCf5XDgjXNYM2Xtgop07us=", + "trim-right": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/trim-right/-/trim-right-1.0.1.tgz", + "integrity": "sha1-yy4SAwZ+DI3h9hQJS5/kVwTqYAM=", "dev": true }, + "tunnel-agent": { + "version": "0.6.0", + "resolved": "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz", + "integrity": "sha1-J6XeoGs2sEoKmWZ3SykIaPD8QP0=", + "dev": true, + "requires": { + "safe-buffer": "^5.0.1" + } + }, "tweetnacl": { "version": "0.14.5", "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz", @@ -4806,7 +4543,6 @@ "version": "0.3.2", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", "integrity": "sha1-WITKtRLPHTVeP7eE8wgEsrUg23I=", - "dev": true, "requires": { "prelude-ls": "~1.1.2" } @@ -4901,6 +4637,36 @@ "punycode": "^2.1.0" } }, + "url": { + "version": "0.11.0", + "resolved": "https://registry.npmjs.org/url/-/url-0.11.0.tgz", + "integrity": "sha1-ODjpfPxgUh63PFJajlW/3Z4uKPE=", + "dev": true, + "requires": { + "punycode": "1.3.2", + "querystring": "0.2.0" + }, + "dependencies": { + "punycode": { + "version": "1.3.2", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz", + "integrity": "sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=", + "dev": true + } + } + }, + "utf8-bytes": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/utf8-bytes/-/utf8-bytes-0.0.1.tgz", + "integrity": "sha1-EWsCVEjJtQAIHN+/H01sbDfYg30=", + "dev": true + }, + "utfstring": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/utfstring/-/utfstring-2.0.0.tgz", + "integrity": "sha512-/ugBfyvIoLe9xqkFHio3CxXnpUKQ1p2LfTxPr6QTRj6GiwpHo73YGdh03UmAzDQNOWpNIE0J5nLss00L4xlWgg==", + "dev": true + }, "util-deprecate": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", @@ -4922,14 +4688,6 @@ "assert-plus": "^1.0.0", "core-util-is": "1.0.2", "extsprintf": "^1.2.0" - }, - "dependencies": { - "assert-plus": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz", - "integrity": "sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU=", - "dev": true - } } }, "walk-back": { @@ -4938,6 +4696,12 @@ "integrity": "sha1-I1h4ejXakQMtrV6S+AsSNw2HlcU=", "dev": true }, + "whatwg-fetch": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.3.tgz", + "integrity": "sha1-nITsLc9oGH/wC8ZOEnS0QhduHIQ=", + "dev": true + }, "which": { "version": "1.3.1", "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", @@ -4957,8 +4721,7 @@ "wordwrap": { "version": "1.0.0", "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", - "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=", - "dev": true + "integrity": "sha1-J1hIEIkUVqQXHI0CJkQa3pDLyus=" }, "wordwrapjs": { "version": "3.0.0", @@ -4985,12 +4748,6 @@ "mkdirp": "^0.5.1" } }, - "xtend": { - "version": "4.0.1", - "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz", - "integrity": "sha1-pcbVMr5lbiPbgg77lDofBJmNY68=", - "dev": true - }, "yallist": { "version": "2.1.2", "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", diff --git a/package.json b/package.json index c78fb37..6d615ca 100644 --- a/package.json +++ b/package.json @@ -25,22 +25,22 @@ "homepage": "https://github.com/srl295/gp-js-flatten#readme", "devDependencies": { "chai": "^3.5.0", - "coveralls": "^2.11.16", + "coveralls": "^3.0.2", "eslint": "^5.1.0", "eslint-plugin-chai-friendly": "^0.4.1", - "g11n-pipeline": "^1.3.0", + "g11n-pipeline": "^3.1.0", "github-markdown-css": "^2.4.1", "handlebars-helper-rawinclude": "^1.0.0", "istanbul": "^0.4.5", "jsdoc-to-markdown": "^3.0.0", "marked": "^0.3.6", - "mocha": "^3.2.0", + "mocha": "^5.2.0", "mocha-eslint": "^4.1.0", - "nyc": "^10.1.2", + "nyc": "^13.0.0", "optional": "^0.1.3", "promtie": "^0.5.0" }, "dependencies": { - "jsonpath": "^0.2.11" + "jsonpath": "^1.0.0" } } From 0227516a06824ef4bd218c51961119c16ffca02c Mon Sep 17 00:00:00 2001 From: "Steven R. Loomis" Date: Tue, 10 Jul 2018 15:36:12 -0700 Subject: [PATCH 3/8] use @evxn/jsonpath per https://github.com/dchester/jsonpath/issues/57#issuecomment-382721217 Fixes: https://github.com/IBM-Cloud/gp-js-flatten/issues/18 --- lib/flatten.js | 2 +- package-lock.json | 36 ++++++++++++++++++------------------ package.json | 2 +- test/flatten1.json | 2 +- test/flatten1r.json | 2 +- test/flatten1x.json | 2 +- test/flatten3.json | 8 ++++---- 7 files changed, 27 insertions(+), 27 deletions(-) diff --git a/lib/flatten.js b/lib/flatten.js index 451e44e..bedbf7b 100644 --- a/lib/flatten.js +++ b/lib/flatten.js @@ -14,7 +14,7 @@ * limitations under the License. */ -const jsonpath = require('jsonpath'); +const jsonpath = require('@evxn/jsonpath'); /** * Flatten a deeply nested object into its jsonpath equivalent diff --git a/package-lock.json b/package-lock.json index 6f0dc3e..bf497ea 100644 --- a/package-lock.json +++ b/package-lock.json @@ -121,6 +121,24 @@ "to-fast-properties": "^2.0.0" } }, + "@evxn/jsonpath": { + "version": "1.3.4", + "resolved": "https://registry.npmjs.org/@evxn/jsonpath/-/jsonpath-1.3.4.tgz", + "integrity": "sha512-eJmX2k0WEQ+Lq9ljAxK4iyCCcY25ynJ1Gv70cZrmxfikF5Qefzb12+xy+Lov3CKvA67kehvbrAKPHZF5IOEBMQ==", + "requires": { + "esprima": "1.2.2", + "jison": "0.4.13", + "static-eval": "2.0.0", + "underscore": "1.7.0" + }, + "dependencies": { + "esprima": { + "version": "1.2.2", + "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.2.2.tgz", + "integrity": "sha1-dqD9Zvz+FU/SkmZ9wmQBl1CxZXs=" + } + } + }, "@kyleshockey/object-assign-deep": { "version": "0.4.2", "resolved": "https://registry.npmjs.org/@kyleshockey/object-assign-deep/-/object-assign-deep-0.4.2.tgz", @@ -2039,24 +2057,6 @@ "integrity": "sha1-Epai1Y/UXxmg9s4B1lcB4sc1tus=", "dev": true }, - "jsonpath": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/jsonpath/-/jsonpath-1.0.0.tgz", - "integrity": "sha1-Rc2dTE0NaCXZC9fkD4PxGCsT3Qc=", - "requires": { - "esprima": "1.2.2", - "jison": "0.4.13", - "static-eval": "2.0.0", - "underscore": "1.7.0" - }, - "dependencies": { - "esprima": { - "version": "1.2.2", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-1.2.2.tgz", - "integrity": "sha1-dqD9Zvz+FU/SkmZ9wmQBl1CxZXs=" - } - } - }, "jsprim": { "version": "1.4.1", "resolved": "https://registry.npmjs.org/jsprim/-/jsprim-1.4.1.tgz", diff --git a/package.json b/package.json index 6d615ca..8d32481 100644 --- a/package.json +++ b/package.json @@ -41,6 +41,6 @@ "promtie": "^0.5.0" }, "dependencies": { - "jsonpath": "^1.0.0" + "@evxn/jsonpath": "^1.3.4" } } diff --git a/test/flatten1.json b/test/flatten1.json index e4631cd..6f38f35 100644 --- a/test/flatten1.json +++ b/test/flatten1.json @@ -3,7 +3,7 @@ "bar": "bar", "$.baz.quux": "true", "$.baz.hey": "hi", - "$.baz[\"π\"]": "3.14159", + "$.baz['π']": "3.14159", "$.list[0]": "a", "$.list[1]": "b", "$.list[2]": "c" diff --git a/test/flatten1r.json b/test/flatten1r.json index b2ed519..d49e67e 100644 --- a/test/flatten1r.json +++ b/test/flatten1r.json @@ -3,7 +3,7 @@ "bar": "бар", "$.baz.quux": "труе", "$.baz.hey": "хи", - "$.baz[\"π\"]": "3.14159", + "$.baz['π']": "3.14159", "$.list[0]": "а", "$.list[1]": "б", "$.list[2]": "ц" diff --git a/test/flatten1x.json b/test/flatten1x.json index 4f0b125..6c58d57 100644 --- a/test/flatten1x.json +++ b/test/flatten1x.json @@ -3,7 +3,7 @@ "$.bar": "bar", "$.baz.quux": "true", "$.baz.hey": "hi", - "$.baz[\"π\"]": "3.14159", + "$.baz['π']": "3.14159", "$.list[0]": "a", "$.list[1]": "b", "$.list[2]": "c" diff --git a/test/flatten3.json b/test/flatten3.json index aa49f48..90d26f1 100644 --- a/test/flatten3.json +++ b/test/flatten3.json @@ -1,9 +1,9 @@ { - "$.buttons[\"agħfas\"]": "click the button", + "$.buttons['agħfas']": "click the button", "$.menus.color.green": "verde", "$.menus.color.red": "rojo", "$.menus.decaf": "false", - "$.menus[\"font size\"][0]": "tall", - "$.menus[\"font size\"][1]": "grande", - "$.menus[\"font size\"][2]": "venti" + "$.menus['font size'][0]": "tall", + "$.menus['font size'][1]": "grande", + "$.menus['font size'][2]": "venti" } \ No newline at end of file From 96adad5a3bca2759a8f236056e3af85f14a1b5e6 Mon Sep 17 00:00:00 2001 From: "Steven R. Loomis" Date: Tue, 10 Jul 2018 15:57:48 -0700 Subject: [PATCH 4/8] unit test and fix for flatten - expand still broken Fixes: https://github.com/IBM-Cloud/gp-js-flatten/issues/18 --- lib/flatten.js | 5 ++++- test/resfiltertest.js | 39 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 test/resfiltertest.js diff --git a/lib/flatten.js b/lib/flatten.js index bedbf7b..a23d9ad 100644 --- a/lib/flatten.js +++ b/lib/flatten.js @@ -29,7 +29,10 @@ module.exports.flatten = function flatten(obj, opts) { return jsonpath .nodes(obj, '$..*') .reduce((p,v) => { - if ( !opts.flattenAll && typeof v.value === 'string' && v.path.length === 2) { + if ( !opts.flattenAll && + typeof v.value === 'string' && + v.path.length === 2 && + v.path[1].substring(0,2) !== '$.') { // It is a simple {key: "value"} … do not modify it p[v.path[1]] = v.value; } else if ( typeof v.value !== 'object') { diff --git a/test/resfiltertest.js b/test/resfiltertest.js new file mode 100644 index 0000000..d5701e5 --- /dev/null +++ b/test/resfiltertest.js @@ -0,0 +1,39 @@ +/* + * Copyright IBM Corp. 2015,2018 + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +const expect = require('chai').expect; +const flatten = require('../'); +const dataInput = require('./gp-res-filter.d/input.json'); +const dataOutput = require('./gp-res-filter.d/output.json'); +const expectOutput = dataOutput.reduce((p, v) => { + const {key,value} = v; + p[key] = value; + return p; +}, {}); + +describe('test vs. gp-res-filter files', function() { + it('should be able to flatten gp-res-filter/input.json', function() { + const input = dataInput; + const output = flatten.flatten(input); + expect(output).to.deep.equal(expectOutput); + }); + it('should be able to expand gp-res-filter/input.json', function() { + const input = expectOutput; + const output = flatten.expand(input); + expect(output).to.deep.equal(dataInput); + }); +}); + From 7a55192a6d177a4800de0e8b60481e67eb1190dc Mon Sep 17 00:00:00 2001 From: "Steven R. Loomis" Date: Tue, 10 Jul 2018 16:03:19 -0700 Subject: [PATCH 5/8] expand: ignore keys that don't start with $ --- lib/flatten.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/flatten.js b/lib/flatten.js index a23d9ad..62d96e7 100644 --- a/lib/flatten.js +++ b/lib/flatten.js @@ -69,6 +69,11 @@ module.exports._apply = function _apply(root, k, v) { // parse the path let path; + if(k[0] !== '$') { + // no JSONpath prefix—ignore + root[k] = v; + return root; + } try { path = jsonpath.parse(k); } catch (e) { From 46910a37882afbf990dbf4742f55bbb6cf9cd986 Mon Sep 17 00:00:00 2001 From: "Steven R. Loomis" Date: Tue, 10 Jul 2018 16:31:20 -0700 Subject: [PATCH 6/8] support arrays Fixes: https://github.com/IBM-Cloud/gp-js-flatten/issues/9 --- lib/flatten.js | 35 ++++++++++++++++++----------------- test/expand1.json | 6 +----- test/expand1r.json | 6 +----- test/expand3.json | 6 +----- 4 files changed, 21 insertions(+), 32 deletions(-) diff --git a/lib/flatten.js b/lib/flatten.js index 62d96e7..f4bae4d 100644 --- a/lib/flatten.js +++ b/lib/flatten.js @@ -82,18 +82,11 @@ function _apply(root, k, v) { root[k]=v; return root; } - path[path.length-1].last = true; // mark last - /*istanbul ignore next*/ _DEBUG && console.dir(path); - path.reduce((cur, pe) => { - /*istanbul ignore next*/ if(_DEBUG) { - console.log('root='); - console.dir(root); - console.log('cur='); - console.dir(cur); - } + let cur = root; + for(let n=0; n Date: Tue, 10 Jul 2018 16:38:29 -0700 Subject: [PATCH 7/8] gp test was out of date --- test/gptest.js | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) diff --git a/test/gptest.js b/test/gptest.js index fdc2522..b5d10bf 100644 --- a/test/gptest.js +++ b/test/gptest.js @@ -30,43 +30,41 @@ describe('test of g11n-pipeline integration', function() { it('should setup the gp client', () => { gpClient = gp.getClient(gpCreds)}) it('should ping the gp server (sanity)', - (done) => gpClient.ping(done)); + () => gpClient.ping()); it('should be able to create a bundle', - (done) => gpClient + () => gpClient .bundle('mytest') .create({ sourceLanguage: 'en', targetLanguages: ['qru'] - }, done)); + })); it('should be able to upload flattened data', - (done) => gpClient + () => gpClient .bundle('mytest') .uploadStrings({ languageId: 'en', strings: flatten.flatten(require('./input1.json')) - }, done)); + })); it('should be able to fetch flattened data', - (done) => gpClient + () => gpClient .bundle('mytest') .getStrings({ languageId: 'en' - }, (err, result) => { - if(err) return done(err); + }) + .then((result) => { expect(result.resourceStrings).to.deep.equal(require('./flatten1.json')); expect(flatten.expand(result.resourceStrings)).to.deep.equal(require('./expand1.json')); - return done(); })); it('should wait a sec for translation', (done) => setTimeout(done, 3000, null)); it('should be able to fetch translated data', - (done) => gpClient + () => gpClient .bundle('mytest') .getStrings({ languageId: 'qru' - }, (err, result) => { - if(err) return done(err); + }) + .then((result) => { expect(result.resourceStrings).to.deep.equal(require('./flatten1r.json')); expect(flatten.expand(result.resourceStrings)).to.deep.equal(require('./expand1r.json')); - return done(); })); }); \ No newline at end of file From e2f203e26f6249380155ed8eeb6be5cef2e39787 Mon Sep 17 00:00:00 2001 From: "Steven R. Loomis" Date: Thu, 12 Jul 2018 17:58:23 -0700 Subject: [PATCH 8/8] drop node 6 --- .travis.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index feb16d5..857f1dc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,6 +1,5 @@ language: node_js node_js: -- '6' - '8' - '10' script: