From f6cb8eef0bb6e938dcb676a80df72e101af64f9d Mon Sep 17 00:00:00 2001
From: sedinkinya <yury.sedinkin@nih.gov>
Date: Wed, 18 Mar 2020 13:33:27 -0400
Subject: [PATCH 01/13] Implement toQuantity(unit)

LF-1351
---
 src/fhirpath.js         |  1 +
 src/misc.js             | 36 +++++++++++++++++
 src/types.js            | 40 ++++++++++++++++++
 test/cases/fhir-r4.yaml | 90 +++++++++++++++++++++++++----------------
 4 files changed, 132 insertions(+), 35 deletions(-)

diff --git a/src/fhirpath.js b/src/fhirpath.js
index ea90d0d..83f30ac 100644
--- a/src/fhirpath.js
+++ b/src/fhirpath.js
@@ -87,6 +87,7 @@ engine.invocationTable = {
   toString:     {fn: misc.toString},
   toDateTime:   {fn: misc.toDateTime},
   toTime:       {fn: misc.toTime},
+  toQuantity:   {fn: misc.toQuantity, arity: {0: [], 1: ["String"]}},
 
   indexOf:        {fn: strings.indexOf,          arity: {1: ["String"]}},
   substring:      {fn: strings.substring,        arity: {1: ["Integer"], 2: ["Integer","Integer"]}},
diff --git a/src/misc.js b/src/misc.js
index b786b75..8620429 100644
--- a/src/misc.js
+++ b/src/misc.js
@@ -5,6 +5,9 @@
 var util = require("./utilities");
 var types = require("./types");
 
+const {FP_Quantity} = types;
+const ucumUtils = require('@lhncbc/ucum-lhc').UcumLhcUtils.getInstance();
+
 var engine = {};
 
 engine.iifMacro = function(data, cond, ok, fail) {
@@ -43,6 +46,39 @@ engine.toInteger = function(coll){
   return [];
 };
 
+const quantityReqex = /(?<value>(\+|-)?\d+(\.\d+)?)\s*((?<unit>'[^']+')|(?<time>[a-zA-Z]+))?/;
+engine.toQuantity = function (coll, toUnit) {
+  let result = [];
+  if (coll.length > 1) {
+    throw new Error("Could not convert to quantity: input collection contains multiple items");
+  } else if (coll.length === 1) {
+    const v = util.valData(coll[0]);
+
+    if (typeof v === "number") {
+      result = new FP_Quantity(v, '\'1\'');
+    } else if (v instanceof FP_Quantity) {
+      result = v;
+    } else if (typeof v === "string") {
+      let {groups: {value, unit, time}} = quantityReqex.exec(v);
+      result = new FP_Quantity(Number(value), unit||time||'\'1\'');
+    }
+
+    if (result && toUnit) {
+      // TODO: Conversion factors for calendar duration should be used when quantitative time values appear in unoccupied calculations
+      const fromUcumUnitCode = FP_Quantity.getUcumUnitCode(result.unit),
+        toUcumUnitCode = FP_Quantity.getUcumUnitCode(toUnit),
+        convResult = ucumUtils.convertUnitTo(fromUcumUnitCode, result.value, toUcumUnitCode);
+      if (convResult.status === 'succeeded') {
+        result = new FP_Quantity(convResult.toVal, toUnit);
+      } else {
+        throw new Error("Could not convert to quantity with unit " + toUnit + ": " + v);
+      }
+    }
+  }
+
+  return result;
+};
+
 var numRegex = /^[+-]?\d+(\.\d+)?$/;
 engine.toDecimal = function(coll){
   if(coll.length != 1) { return []; }
diff --git a/src/types.js b/src/types.js
index c8e4132..e98824d 100644
--- a/src/types.js
+++ b/src/types.js
@@ -65,8 +65,48 @@ class FP_Quantity extends FP_Type {
     this.value = value;
     this.unit = unit;
   }
+
+  equals(otherQuantity) {
+    if (!(otherQuantity instanceof this.constructor))
+      return false;
+
+    const ucumUnit = FP_Quantity.getUcumUnitCode(this.unit),
+        otherUcumUnit = FP_Quantity.getUcumUnitCode(otherQuantity.unit);
+
+
+    return this.value === otherQuantity.value && ucumUnit === otherUcumUnit;
+  }
+
+  equivalentTo(otherQuantity) {
+    if (!(otherQuantity instanceof this.constructor))
+      return false;
+
+    const ucumUnitCode = FP_Quantity.getUcumUnitCode(this.unit),
+        otherUcumUnitCode = FP_Quantity.getUcumUnitCode(otherQuantity.unit),
+        convResult = ucumUtils.convertUnitTo(otherUcumUnitCode, otherQuantity.value, ucumUnitCode);
+
+    if (convResult.status !== 'succeeded') {
+      return false;
+    }
+
+    return this.value === convResult.toVal;
+  }
 }
 
+/**
+ * Converts a FHIR path unit to a UCUM unit code by converting a calendar duration keyword to a UCUM unit code
+ * or removing single quotes for a UCUM unit.
+ * @param {string} unit
+ * @return {string}
+ */
+FP_Quantity.getUcumUnitCode = function (unit) {
+  if (/'([^']+)'/.test(FP_Quantity.timeUnitsToUCUM[unit]||unit)) {
+    return RegExp.$1;
+  } else {
+    throw new Error('Unsupported unit: ' + unit);
+  }
+};
+
 /**
  *  Defines a map from FHIRPath time units to UCUM.
  */
diff --git a/test/cases/fhir-r4.yaml b/test/cases/fhir-r4.yaml
index 75040f9..050b3d5 100644
--- a/test/cases/fhir-r4.yaml
+++ b/test/cases/fhir-r4.yaml
@@ -500,6 +500,61 @@ tests:
         expression: (1|2).not() = false
         result:
           - true
+  - 'group: testTypes - toQuantity':
+      - desc: '** test'
+        inputfile: patient-example.json
+        expression: 1.toQuantity() = 1 '1'
+        result:
+          - true
+      - desc: '** test'
+        inputfile: patient-example.json
+        expression: 1.0.toQuantity() = 1.0 '1'
+        result:
+          - true
+      - desc: '** test'
+        inputfile: patient-example.json
+        expression: '''1''.toQuantity()'
+        result:
+          - 1 '1'
+      - desc: '** test'
+        inputfile: patient-example.json
+        expression: '''1 day''.toQuantity() = 1 day'
+        result:
+          - true
+      - desc: '** test'
+        inputfile: patient-example.json
+        expression: '''1 day''.toQuantity() = 1 ''d'''
+        result:
+          - true
+      - desc: '** test'
+        inputfile: patient-example.json
+        expression: '''1 \''wk\''''.toQuantity() = 1 week'
+        result:
+          - true
+      - desc: '** test'
+        inputfile: patient-example.json
+        expression: '''1.0''.toQuantity() ~ 1 ''1'''
+        result:
+          - true
+      - desc: '** test'
+        inputfile: patient-example.json
+        expression: '''1 \''wk\''''.toQuantity() = 7 days'
+        result:
+          - false
+      - desc: '** test'
+        inputfile: patient-example.json
+        expression: '''1 \''wk\''''.toQuantity(''days'') = 7 days'
+        result:
+          - true
+      - desc: '** test'
+        inputfile: patient-example.json
+        expression: '''1 \''wk\''''.toQuantity(''\''d\'''') = 7 days'
+        result:
+          - true
+      - desc: '** test'
+        inputfile: patient-example.json
+        expression: '''1 \''wk\''''.toQuantity(''exception'')'
+        error: true
   - 'group: testTypes':
       - desc: '** test'
         inputfile: patient-example.json
@@ -696,41 +751,6 @@ tests:
         expression: true.isQuantity()
         result:
           - false
-      - desc: '** test'
-        inputfile: patient-example.json
-        expression: 1.toQuantity() = 1 '1'
-        result:
-          - true
-      - desc: '** test'
-        inputfile: patient-example.json
-        expression: 1.0.toQuantity() = 1.0 '1'
-        result:
-          - true
-      - desc: '** test'
-        inputfile: patient-example.json
-        expression: '''1''.toQuantity()'
-        result:
-          - 1 '1'
-      - desc: '** test'
-        inputfile: patient-example.json
-        expression: '''1 day''.toQuantity() = 1 day'
-        result:
-          - true
-      - desc: '** test'
-        inputfile: patient-example.json
-        expression: '''1 day''.toQuantity() = 1 ''d'''
-        result:
-          - true
-      - desc: '** test'
-        inputfile: patient-example.json
-        expression: '''1 \''wk\''''.toQuantity() = 1 week'
-        result:
-          - true
-      - desc: '** test'
-        inputfile: patient-example.json
-        expression: '''1.0''.toQuantity() ~ 1 ''1'''
-        result:
-          - true
       - desc: '** test'
         inputfile: patient-example.json
         expression: 1.isBoolean()

From 5a5471cef3fc5fdb59b7de09237ece031859d289 Mon Sep 17 00:00:00 2001
From: sedinkinya <yury.sedinkin@nih.gov>
Date: Tue, 24 Mar 2020 13:40:37 -0400
Subject: [PATCH 02/13] Fixes for previous 'Implement toQuantity(unit)'

LF-1351
---
 src/deep-equal.js                    |  66 +----------
 src/misc.js                          |  23 ++--
 src/numbers.js                       |  81 +++++++++++++
 src/types.js                         | 164 +++++++++++++++++++++++++--
 test/cases/fhir-r4.yaml              |  45 +++++++-
 test/resources/quantity-example.json |  14 +++
 6 files changed, 305 insertions(+), 88 deletions(-)
 create mode 100644 src/numbers.js
 create mode 100644 test/resources/quantity-example.json

diff --git a/src/deep-equal.js b/src/deep-equal.js
index 4d17275..bcc25f8 100644
--- a/src/deep-equal.js
+++ b/src/deep-equal.js
@@ -5,6 +5,7 @@
 var types = require('./types');
 var FP_Type = types.FP_Type;
 var util = require('./utilities');
+var numbers = require('./numbers');
 var pSlice = Array.prototype.slice;
 var objectKeys = Object.keys;
 var isArguments = function (object) {
@@ -24,54 +25,6 @@ function normalizeStr(x) {
 }
 
 
-// Returns the number of digits in the number after the decimal point, ignoring
-// trailing zeros.
-function decimalPlaces(x) {
-  // Based on https://stackoverflow.com/a/9539746/360782
-  // Make sure it is a number and use the builtin number -> string.
-  var s = "" + (+x);
-  var match = /(\d+)(?:\.(\d+))?(?:[eE]([+-]?\d+))?$/.exec(s);
-  // NaN or Infinity or integer.
-  // We arbitrarily decide that Infinity is integral.
-  if (!match) { return 0; }
-  // Count the number of digits in the fraction and subtract the
-  // exponent to simulate moving the decimal point left by exponent places.
-  // 1.234e+2 has 1 fraction digit and '234'.length -  2 == 1
-  // 1.234e-2 has 5 fraction digit and '234'.length - -2 == 5
-  //var wholeNum = match[1];
-  var fraction = match[2];
-  var exponent = match[3];
-  return Math.max(
-    0,  // lower limit.
-    (fraction == '0' ? 0 : (fraction || '').length)  // fraction length
-    - (exponent || 0));  // exponent
-}
-
-
-/**
- *  The smallest representable number in FHIRPath.
- */
-const PRECISION_STEP = 1e-8;
-
-/**
- *  Rounds a number to the nearest multiple of PRECISION_STEP.
- */
-function roundToMaxPrecision(x) {
-  return Math.round(x/PRECISION_STEP)*PRECISION_STEP;
-}
-
-
-/**
- *  Rounds a number to the specified number of decimal places.
- * @param x the decimal number to be rounded
- * @param n the (maximum) number of decimal places to preserve.  (The result
- *  could contain fewer if the decimal digits in x contain zeros).
- */
-function roundToDecimalPlaces(x, n) {
-  var scale = Math.pow(10, n);
-  return Math.round(x*scale)/scale;
-}
-
 var deepEqual = function (actual, expected, opts) {
   actual = util.valData(actual);
   expected = util.valData(expected);
@@ -86,21 +39,8 @@ var deepEqual = function (actual, expected, opts) {
     if(isString(actual) && isString(expected)) {
       return normalizeStr(actual) == normalizeStr(expected);
     }
-
-    if(Number.isInteger(actual) && Number.isInteger(expected)) {
-      return actual === expected;
-    }
-
     if(isNumber(actual) && isNumber(expected)) {
-      var prec = Math.min(decimalPlaces(actual), decimalPlaces(expected));
-      if(prec === 0){
-        return Math.round(actual) === Math.round(expected);
-      } else {
-        // Note: Number.parseFloat(0.00000011).toPrecision(7) ===  "1.100000e-7"
-        // It does # of significant digits, not decimal places.
-        return roundToDecimalPlaces(actual, prec) ===
-          roundToDecimalPlaces(expected, prec);
-      }
+      return numbers.isEquival(actual, expected);
     }
   }
   else { // !opts.fuzzy
@@ -108,7 +48,7 @@ var deepEqual = function (actual, expected, opts) {
     // precision to remove floating point arithmetic errors (e.g. 0.1+0.1+0.1 should
     // equal 0.3) before comparing.
     if (typeof actual === 'number' && typeof expected === 'number') {
-      return roundToMaxPrecision(actual) === roundToMaxPrecision(expected);
+      return numbers.isEqual(actual, expected);
     }
   }
 
diff --git a/src/misc.js b/src/misc.js
index 8620429..2f7ab49 100644
--- a/src/misc.js
+++ b/src/misc.js
@@ -5,7 +5,7 @@
 var util = require("./utilities");
 var types = require("./types");
 
-const {FP_Quantity} = types;
+const {FP_Quantity, ResourceNode} = types;
 const ucumUtils = require('@lhncbc/ucum-lhc').UcumLhcUtils.getInstance();
 
 var engine = {};
@@ -53,26 +53,23 @@ engine.toQuantity = function (coll, toUnit) {
     throw new Error("Could not convert to quantity: input collection contains multiple items");
   } else if (coll.length === 1) {
     const v = util.valData(coll[0]);
+    let quantityRegexRes;
 
-    if (typeof v === "number") {
+    if (coll[0] instanceof ResourceNode && v.system === this.vars.ucum) {
+      if (typeof v.value === 'number' && typeof v.code === 'string') {
+        result = new FP_Quantity(Number(v.value), FP_Quantity.mapUCUMCodeToTimeUnits[v.code] || '\'' + v.code + '\'');
+      }
+    } else if (typeof v === "number") {
       result = new FP_Quantity(v, '\'1\'');
     } else if (v instanceof FP_Quantity) {
       result = v;
-    } else if (typeof v === "string") {
-      let {groups: {value, unit, time}} = quantityReqex.exec(v);
+    } else if (typeof v === "string" && (quantityRegexRes = quantityReqex.exec(v)) ) {
+      let {groups: {value, unit, time}} = quantityRegexRes;
       result = new FP_Quantity(Number(value), unit||time||'\'1\'');
     }
 
     if (result && toUnit) {
-      // TODO: Conversion factors for calendar duration should be used when quantitative time values appear in unoccupied calculations
-      const fromUcumUnitCode = FP_Quantity.getUcumUnitCode(result.unit),
-        toUcumUnitCode = FP_Quantity.getUcumUnitCode(toUnit),
-        convResult = ucumUtils.convertUnitTo(fromUcumUnitCode, result.value, toUcumUnitCode);
-      if (convResult.status === 'succeeded') {
-        result = new FP_Quantity(convResult.toVal, toUnit);
-      } else {
-        throw new Error("Could not convert to quantity with unit " + toUnit + ": " + v);
-      }
+      result = FP_Quantity.convUnitTo(result.unit, result.value, toUnit) || [];
     }
   }
 
diff --git a/src/numbers.js b/src/numbers.js
new file mode 100644
index 0000000..22b9938
--- /dev/null
+++ b/src/numbers.js
@@ -0,0 +1,81 @@
+let engine = {};
+
+// Returns the number of digits in the number after the decimal point, ignoring
+// trailing zeros.
+function decimalPlaces(x) {
+  // Based on https://stackoverflow.com/a/9539746/360782
+  // Make sure it is a number and use the builtin number -> string.
+  var s = "" + (+x);
+  var match = /(\d+)(?:\.(\d+))?(?:[eE]([+-]?\d+))?$/.exec(s);
+  // NaN or Infinity or integer.
+  // We arbitrarily decide that Infinity is integral.
+  if (!match) { return 0; }
+  // Count the number of digits in the fraction and subtract the
+  // exponent to simulate moving the decimal point left by exponent places.
+  // 1.234e+2 has 1 fraction digit and '234'.length -  2 == 1
+  // 1.234e-2 has 5 fraction digit and '234'.length - -2 == 5
+  //var wholeNum = match[1];
+  var fraction = match[2];
+  var exponent = match[3];
+  return Math.max(
+    0,  // lower limit.
+    (fraction == '0' ? 0 : (fraction || '').length)  // fraction length
+    - (exponent || 0));  // exponent
+}
+
+/**
+ *  Rounds a number to the specified number of decimal places.
+ * @param x the decimal number to be rounded
+ * @param n the (maximum) number of decimal places to preserve.  (The result
+ *  could contain fewer if the decimal digits in x contain zeros).
+ */
+function roundToDecimalPlaces (x, n) {
+  var scale = Math.pow(10, n);
+  return Math.round(x*scale)/scale;
+}
+
+/**
+ *  The smallest representable number in FHIRPath.
+ */
+const PRECISION_STEP = 1e-8;
+
+/**
+ *  Rounds a number to the nearest multiple of PRECISION_STEP.
+ */
+function roundToMaxPrecision(x) {
+  return Math.round(x/PRECISION_STEP)*PRECISION_STEP;
+}
+
+/**
+ * Determines number equality
+ * @param {number} actual
+ * @param {number} expected
+ * @return {boolean}
+ */
+engine.isEquival = function(actual, expected) {
+  if(Number.isInteger(actual) && Number.isInteger(expected)) {
+    return actual === expected;
+  }
+
+  var prec = Math.min(decimalPlaces(actual), decimalPlaces(expected));
+  if(prec === 0){
+    return Math.round(actual) === Math.round(expected);
+  } else {
+    // Note: Number.parseFloat(0.00000011).toPrecision(7) ===  "1.100000e-7"
+    // It does # of significant digits, not decimal places.
+    return roundToDecimalPlaces(actual, prec) ===
+      roundToDecimalPlaces(expected, prec);
+  }
+};
+
+/**
+ * Determines numbers equality
+ * @param {number} actual
+ * @param {number} expected
+ * @return {boolean}
+ */
+engine.isEqual = function(actual, expected) {
+  return roundToMaxPrecision(actual) === roundToMaxPrecision(expected);
+};
+
+module.exports = engine;
\ No newline at end of file
diff --git a/src/types.js b/src/types.js
index e98824d..3f6fcac 100644
--- a/src/types.js
+++ b/src/types.js
@@ -1,5 +1,6 @@
 const addMinutes = require('date-fns/add_minutes');
 const ucumUtils = require('@lhncbc/ucum-lhc').UcumLhcUtils.getInstance();
+const numbers = require('./numbers');
 
 let timeFormat =
   '[0-9][0-9](\\:[0-9][0-9](\\:[0-9][0-9](\\.[0-9]+)?)?)?(Z|(\\+|-)[0-9][0-9]\\:[0-9][0-9])?';
@@ -70,36 +71,76 @@ class FP_Quantity extends FP_Type {
     if (!(otherQuantity instanceof this.constructor))
       return false;
 
-    const ucumUnit = FP_Quantity.getUcumUnitCode(this.unit),
-        otherUcumUnit = FP_Quantity.getUcumUnitCode(otherQuantity.unit);
+    // Special year/month comparision case: 1 year = 12 month
+    const compareYearsAndMonths = this._compareYearsAndMonths(otherQuantity);
+    if (compareYearsAndMonths) {
+      return compareYearsAndMonths.isEqual;
+    }
+
+    // General comparision case
+    const thisQuantity = FP_Quantity.toUcumQuantity(this.value, this.unit),
+      normalizedOtherQuantity = FP_Quantity.toUcumQuantity(otherQuantity.value, otherQuantity.unit),
+      convResult = ucumUtils.convertUnitTo(normalizedOtherQuantity.unit, normalizedOtherQuantity.value, thisQuantity.unit);
 
+    if (convResult.status !== 'succeeded') {
+      return false;
+    }
 
-    return this.value === otherQuantity.value && ucumUnit === otherUcumUnit;
+    return numbers.isEqual(thisQuantity.value, convResult.toVal);
   }
 
   equivalentTo(otherQuantity) {
     if (!(otherQuantity instanceof this.constructor))
       return false;
 
-    const ucumUnitCode = FP_Quantity.getUcumUnitCode(this.unit),
-        otherUcumUnitCode = FP_Quantity.getUcumUnitCode(otherQuantity.unit),
-        convResult = ucumUtils.convertUnitTo(otherUcumUnitCode, otherQuantity.value, ucumUnitCode);
+    const ucumUnitCode = FP_Quantity.getEquivalentUcumUnitCode(this.unit),
+      otherUcumUnitCode = FP_Quantity.getEquivalentUcumUnitCode(otherQuantity.unit),
+      convResult = ucumUtils.convertUnitTo(otherUcumUnitCode, otherQuantity.value, ucumUnitCode);
 
     if (convResult.status !== 'succeeded') {
       return false;
     }
 
-    return this.value === convResult.toVal;
+    return numbers.isEquival(this.value, convResult.toVal);
   }
+
+  /**
+   * If both quantities have one of these units: year or month,
+   * then a special case will apply; otherwise returns null.
+   * In the special case of comparison, the fact that 1 year = 12 months is used.
+   *
+   * Just note: in general, for a calendar duration:
+   * 1 year = 365 days
+   * 12 month = 12*30 days = 360 days
+   * so, 1 year != 12 month
+   * That's why this special case is needed
+   *
+   * @param {FP_Quantity} otherQuantity
+   * @return {null|{isEqual: boolean}}
+   * @private
+   */
+  _compareYearsAndMonths(otherQuantity) {
+    const magnitude1 = FP_Quantity._yearMonthConversionFactor[this.unit],
+      magnitude2 = FP_Quantity._yearMonthConversionFactor[otherQuantity.unit];
+
+    if ( magnitude1 && magnitude2) {
+      return {
+        isEqual: numbers.isEqual(this.value*magnitude1, otherQuantity.value*magnitude2)
+      }
+    }
+
+    return null;
+  };
+
 }
 
 /**
- * Converts a FHIR path unit to a UCUM unit code by converting a calendar duration keyword to a UCUM unit code
+ * Converts a FHIR path unit to a UCUM unit code by converting a calendar duration keyword to an equivalent UCUM unit code
  * or removing single quotes for a UCUM unit.
  * @param {string} unit
  * @return {string}
  */
-FP_Quantity.getUcumUnitCode = function (unit) {
+FP_Quantity.getEquivalentUcumUnitCode = function (unit) {
   if (/'([^']+)'/.test(FP_Quantity.timeUnitsToUCUM[unit]||unit)) {
     return RegExp.$1;
   } else {
@@ -107,6 +148,95 @@ FP_Quantity.getUcumUnitCode = function (unit) {
   }
 };
 
+/**
+ * Converts FHIR path value/unit to UCUM value/unit. Usable for comparision.
+ * @param {number} value
+ * @param {string} unit
+ * @returns { {value: number, unit: string} }
+ */
+FP_Quantity.toUcumQuantity = function (value, unit) {
+  const magnitude = FP_Quantity._calendarDuration2Seconds[unit];
+  if (magnitude) {
+    return {
+      value: magnitude * value,
+      unit: 's'
+    }
+  } else {
+    unit = unit.replace(/^'|'$/g, '');
+  }
+  return { value, unit };
+};
+
+/**
+ * Converts FHIR path value/unit to other FHIR value/unit.
+ * @param {string} fromUnit
+ * @param {number} value
+ * @param {string} toUnit
+ * @return {FP_Quantity|null}
+ */
+FP_Quantity.convUnitTo = function (fromUnit, value, toUnit) {
+  // 1 Year <-> 12 Months
+  const fromYearMonthMagnitude = FP_Quantity._yearMonthConversionFactor[fromUnit],
+    toYearMonthMagnitude = FP_Quantity._yearMonthConversionFactor[toUnit];
+  if (fromYearMonthMagnitude && toYearMonthMagnitude) {
+    return new FP_Quantity( fromYearMonthMagnitude*value/toYearMonthMagnitude, toUnit)
+  }
+
+  const fromMagnitude = FP_Quantity._calendarDuration2Seconds[fromUnit],
+    toMagnitude = FP_Quantity._calendarDuration2Seconds[toUnit];
+
+  // To FHIR path calendar duration
+  if (toMagnitude) {
+    if (fromMagnitude) {
+      return new FP_Quantity( fromMagnitude*value/toMagnitude, toUnit)
+    } else {
+      const convResult = ucumUtils.convertUnitTo(fromUnit.replace(/^'|'$/g, ''), value, 's');
+
+      if (convResult.status === 'succeeded') {
+        return new FP_Quantity(convResult.toVal/toMagnitude, toUnit);
+      }
+    }
+  // To Ucum unit
+  } else {
+    const convResult = fromMagnitude ? ucumUtils.convertUnitTo('s', fromMagnitude*value, toUnit.replace(/^'|'$/g, ''))
+      : ucumUtils.convertUnitTo(fromUnit.replace(/^'|'$/g, ''), value, toUnit.replace(/^'|'$/g, ''));
+
+    if(convResult.status === 'succeeded') {
+      return new FP_Quantity(convResult.toVal, toUnit);
+    }
+  }
+
+  return null;
+};
+
+// Defines conversion factors for calendar durations
+FP_Quantity._calendarDuration2Seconds = {
+  'years': 365*24*60*60,
+  'months': 30*24*60*60,
+  'weeks': 7*24*60*60,
+  'days': 24*60*60,
+  'hours': 60*60,
+  'minutes': 60,
+  'seconds': 1,
+  'milliseconds': .001,
+  'year': 365*24*60*60,
+  'month': 30*24*60*60,
+  'week': 7*24*60*60,
+  'day': 24*60*60,
+  'hour': 60*60,
+  'minute': 60,
+  'second': 1,
+  'millisecond': .001
+};
+
+// Defines special case to compare years with months for calendar durations
+FP_Quantity._yearMonthConversionFactor = {
+  'years': 12,
+  'months': 1,
+  'year': 12,
+  'month': 1
+};
+
 /**
  *  Defines a map from FHIRPath time units to UCUM.
  */
@@ -137,6 +267,20 @@ FP_Quantity.timeUnitsToUCUM = {
   "'ms'": "'ms'"
 };
 
+/**
+ *  Defines a map from UCUM code to FHIRPath time units.
+ */
+FP_Quantity.mapUCUMCodeToTimeUnits = {
+  'a': "year",
+  'mo': "month",
+  'wk': "week",
+  'd': "day",
+  'h': "hour",
+  'min': "minute",
+  's': "second",
+  'ms': "millisecond",
+};
+
 
 /**
  *  A map of the UCUM units that must be paired with integer values when doing
@@ -800,6 +944,8 @@ class ResourceNode {
    *  this parameter.
    */
   constructor(data, path) {
+    // console.log('>>>', path);
+    // console.log(JSON.stringify(data, null, 4));
     // If data is a resource (maybe a contained resource) reset the path
     // information to the resource type.
     if (data.resourceType)
diff --git a/test/cases/fhir-r4.yaml b/test/cases/fhir-r4.yaml
index 050b3d5..6d58c9f 100644
--- a/test/cases/fhir-r4.yaml
+++ b/test/cases/fhir-r4.yaml
@@ -89,6 +89,7 @@ tests:
       - desc: '** testPolymorphismAsA'
         inputfile: observation-example.json
         expression: Observation.value.as(Quantity).unit
+#        focus: true
         result:
           - lbs
       - desc: '** testPolymorphismAsA'
@@ -540,7 +541,7 @@ tests:
         inputfile: patient-example.json
         expression: '''1 \''wk\''''.toQuantity() = 7 days'
         result:
-          - false
+          - true
       - desc: '** test'
         inputfile: patient-example.json
         expression: '''1 \''wk\''''.toQuantity(''days'') = 7 days'
@@ -553,8 +554,46 @@ tests:
           - true
       - desc: '** test'
         inputfile: patient-example.json
-        expression: '''1 \''wk\''''.toQuantity(''exception'')'
-        error: true
+        expression: '''1 year''.toQuantity() = 1 ''a'''
+        result:
+          - false
+      - desc: '** test'
+        inputfile: patient-example.json
+        expression: '''1 year''.toQuantity() ~ 1 ''a'''
+        result:
+          - true
+      - desc: '** test'
+        inputfile: patient-example.json
+        expression: '''1 cm''.toQuantity(''\''mm\'''').value = 10'
+        result:
+          - true
+      - desc: '** test'
+        inputfile: patient-example.json
+        expression: '''1 cm''.toQuantity(''\''g\'''')'
+        result: []
+      - desc: '** test'
+        inputfile: quantity-example.json
+        expression: Quantity.valueQuantity[0].toQuantity().unit
+        result:
+          - year
+      - desc: '** test'
+        inputfile: quantity-example.json
+        expression: Quantity.valueQuantity[0].toQuantity().value
+        result:
+          - 2
+      - desc: '** test'
+        inputfile: quantity-example.json
+        expression: Quantity.valueQuantity[1].toQuantity() = 3 'min'
+        result:
+          - true
+      - desc: '** test'
+        inputfile: patient-example.json
+        expression: '''1 \''wk\''''.toQuantity(''nonexistent-unit'')'
+        result: []
+      - desc: '** test'
+        inputfile: patient-example.json
+        expression: '''\''wk\''''.toQuantity()'
+        result: []
   - 'group: testTypes':
       - desc: '** test'
         inputfile: patient-example.json
diff --git a/test/resources/quantity-example.json b/test/resources/quantity-example.json
new file mode 100644
index 0000000..64da4d8
--- /dev/null
+++ b/test/resources/quantity-example.json
@@ -0,0 +1,14 @@
+{
+  "resourceType": "Quantity",
+  "valueQuantity": [{
+    "value": 2,
+    "unit": "year(real UCUM code in field 'code')",
+    "system": "http://unitsofmeasure.org",
+    "code": "a"
+  },{
+    "value": 3,
+    "unit": "year(real UCUM code in field 'code')",
+    "system": "http://unitsofmeasure.org",
+    "code": "min"
+  }]
+}
\ No newline at end of file

From 9826927ef7c5d8d39559692ca69f33015f1128e5 Mon Sep 17 00:00:00 2001
From: sedinkinya <yury.sedinkin@nih.gov>
Date: Thu, 26 Mar 2020 16:43:38 -0400
Subject: [PATCH 03/13] Fixes for previous 'Implement toQuantity(unit)'

LF-1351
---
 src/deep-equal.js                    |  2 +-
 src/misc.js                          | 15 +++++-----
 src/numbers.js                       | 25 +++++++++--------
 src/types.js                         | 41 +++++++++++++++++++++-------
 test/cases/fhir-r4.yaml              | 34 +++++++++++++++++++----
 test/resources/quantity-example.json | 37 ++++++++++++++++++-------
 6 files changed, 109 insertions(+), 45 deletions(-)

diff --git a/src/deep-equal.js b/src/deep-equal.js
index bcc25f8..be3713b 100644
--- a/src/deep-equal.js
+++ b/src/deep-equal.js
@@ -40,7 +40,7 @@ var deepEqual = function (actual, expected, opts) {
       return normalizeStr(actual) == normalizeStr(expected);
     }
     if(isNumber(actual) && isNumber(expected)) {
-      return numbers.isEquival(actual, expected);
+      return numbers.isEquivalent(actual, expected);
     }
   }
   else { // !opts.fuzzy
diff --git a/src/misc.js b/src/misc.js
index 2f7ab49..c452577 100644
--- a/src/misc.js
+++ b/src/misc.js
@@ -5,8 +5,7 @@
 var util = require("./utilities");
 var types = require("./types");
 
-const {FP_Quantity, ResourceNode} = types;
-const ucumUtils = require('@lhncbc/ucum-lhc').UcumLhcUtils.getInstance();
+const { FP_Quantity } = types;
 
 var engine = {};
 
@@ -46,24 +45,26 @@ engine.toInteger = function(coll){
   return [];
 };
 
-const quantityReqex = /(?<value>(\+|-)?\d+(\.\d+)?)\s*((?<unit>'[^']+')|(?<time>[a-zA-Z]+))?/;
+const quantityRegex = /(?<value>(\+|-)?\d+(\.\d+)?)\s*((?<unit>'[^']+')|(?<time>[a-zA-Z]+))?/;
 engine.toQuantity = function (coll, toUnit) {
   let result = [];
   if (coll.length > 1) {
     throw new Error("Could not convert to quantity: input collection contains multiple items");
   } else if (coll.length === 1) {
-    const v = util.valData(coll[0]);
+    const item = coll[0],
+      v = util.valData(item);
     let quantityRegexRes;
 
-    if (coll[0] instanceof ResourceNode && v.system === this.vars.ucum) {
+    if (item.path === 'Quantity' && v.system === this.vars.ucum) {
+      // The Mapping from FHIR Quantity to FHIRPath System.Quantity is explained here: https://www.hl7.org/fhir/fhirpath.html#quantity
       if (typeof v.value === 'number' && typeof v.code === 'string') {
-        result = new FP_Quantity(Number(v.value), FP_Quantity.mapUCUMCodeToTimeUnits[v.code] || '\'' + v.code + '\'');
+        result = new FP_Quantity(v.value, FP_Quantity.mapUCUMCodeToTimeUnits[v.code] || '\'' + v.code + '\'');
       }
     } else if (typeof v === "number") {
       result = new FP_Quantity(v, '\'1\'');
     } else if (v instanceof FP_Quantity) {
       result = v;
-    } else if (typeof v === "string" && (quantityRegexRes = quantityReqex.exec(v)) ) {
+    } else if (typeof v === "string" && (quantityRegexRes = quantityRegex.exec(v)) ) {
       let {groups: {value, unit, time}} = quantityRegexRes;
       result = new FP_Quantity(Number(value), unit||time||'\'1\'');
     }
diff --git a/src/numbers.js b/src/numbers.js
index 22b9938..acaa4f1 100644
--- a/src/numbers.js
+++ b/src/numbers.js
@@ -1,12 +1,12 @@
-let engine = {};
+let numberFns = {};
 
 // Returns the number of digits in the number after the decimal point, ignoring
 // trailing zeros.
 function decimalPlaces(x) {
   // Based on https://stackoverflow.com/a/9539746/360782
   // Make sure it is a number and use the builtin number -> string.
-  var s = "" + (+x);
-  var match = /(\d+)(?:\.(\d+))?(?:[eE]([+-]?\d+))?$/.exec(s);
+  const s = "" + (+x),
+    match = /(\d+)(?:\.(\d+))?(?:[eE]([+-]?\d+))?$/.exec(s);
   // NaN or Infinity or integer.
   // We arbitrarily decide that Infinity is integral.
   if (!match) { return 0; }
@@ -15,11 +15,11 @@ function decimalPlaces(x) {
   // 1.234e+2 has 1 fraction digit and '234'.length -  2 == 1
   // 1.234e-2 has 5 fraction digit and '234'.length - -2 == 5
   //var wholeNum = match[1];
-  var fraction = match[2];
-  var exponent = match[3];
+  const fraction = match[2],
+    exponent = match[3];
   return Math.max(
     0,  // lower limit.
-    (fraction == '0' ? 0 : (fraction || '').length)  // fraction length
+    (fraction === '0' ? 0 : (fraction || '').length)  // fraction length
     - (exponent || 0));  // exponent
 }
 
@@ -30,7 +30,7 @@ function decimalPlaces(x) {
  *  could contain fewer if the decimal digits in x contain zeros).
  */
 function roundToDecimalPlaces (x, n) {
-  var scale = Math.pow(10, n);
+  const scale = Math.pow(10, n);
   return Math.round(x*scale)/scale;
 }
 
@@ -47,17 +47,18 @@ function roundToMaxPrecision(x) {
 }
 
 /**
- * Determines number equality
+ * Determines numbers equivalence
  * @param {number} actual
  * @param {number} expected
  * @return {boolean}
  */
-engine.isEquival = function(actual, expected) {
+numberFns.isEquivalent = function(actual, expected) {
   if(Number.isInteger(actual) && Number.isInteger(expected)) {
     return actual === expected;
   }
 
-  var prec = Math.min(decimalPlaces(actual), decimalPlaces(expected));
+  const prec = Math.min(decimalPlaces(actual), decimalPlaces(expected));
+
   if(prec === 0){
     return Math.round(actual) === Math.round(expected);
   } else {
@@ -74,8 +75,8 @@ engine.isEquival = function(actual, expected) {
  * @param {number} expected
  * @return {boolean}
  */
-engine.isEqual = function(actual, expected) {
+numberFns.isEqual = function(actual, expected) {
   return roundToMaxPrecision(actual) === roundToMaxPrecision(expected);
 };
 
-module.exports = engine;
\ No newline at end of file
+module.exports = numberFns;
\ No newline at end of file
diff --git a/src/types.js b/src/types.js
index 3f6fcac..cbc5ee4 100644
--- a/src/types.js
+++ b/src/types.js
@@ -101,7 +101,7 @@ class FP_Quantity extends FP_Type {
       return false;
     }
 
-    return numbers.isEquival(this.value, convResult.toVal);
+    return numbers.isEquivalent(this.value, convResult.toVal);
   }
 
   /**
@@ -134,6 +134,7 @@ class FP_Quantity extends FP_Type {
 
 }
 
+const  surroundingApostrophesRegex = /^'|'$/g;
 /**
  * Converts a FHIR path unit to a UCUM unit code by converting a calendar duration keyword to an equivalent UCUM unit code
  * or removing single quotes for a UCUM unit.
@@ -141,11 +142,7 @@ class FP_Quantity extends FP_Type {
  * @return {string}
  */
 FP_Quantity.getEquivalentUcumUnitCode = function (unit) {
-  if (/'([^']+)'/.test(FP_Quantity.timeUnitsToUCUM[unit]||unit)) {
-    return RegExp.$1;
-  } else {
-    throw new Error('Unsupported unit: ' + unit);
-  }
+  return FP_Quantity.mapTimeUnitsToUCUMCode[unit] || unit.replace(surroundingApostrophesRegex, '');
 };
 
 /**
@@ -161,14 +158,16 @@ FP_Quantity.toUcumQuantity = function (value, unit) {
       value: magnitude * value,
       unit: 's'
     }
-  } else {
-    unit = unit.replace(/^'|'$/g, '');
   }
-  return { value, unit };
+
+  return {
+    value,
+    unit: unit.replace(surroundingApostrophesRegex, '')
+  };
 };
 
 /**
- * Converts FHIR path value/unit to other FHIR value/unit.
+ * Converts FHIRPath value/unit to other FHIRPath value/unit.
  * @param {string} fromUnit
  * @param {number} value
  * @param {string} toUnit
@@ -281,6 +280,28 @@ FP_Quantity.mapUCUMCodeToTimeUnits = {
   'ms': "millisecond",
 };
 
+/**
+ *  Defines a map from FHIRPath time units to UCUM code.
+ */
+FP_Quantity.mapTimeUnitsToUCUMCode = {
+  'years': "a",
+  'months': "mo",
+  'weeks': "wk",
+  'days': "d",
+  'hours': "h",
+  'minutes': "min",
+  'seconds': "s",
+  'milliseconds': "ms",
+  'year': "a",
+  'month': "mo",
+  'week': "wk",
+  'day': "d",
+  'hour': "h",
+  'minute': "min",
+  'second': "s",
+  'millisecond': "ms"
+};
+
 
 /**
  *  A map of the UCUM units that must be paired with integer values when doing
diff --git a/test/cases/fhir-r4.yaml b/test/cases/fhir-r4.yaml
index 6d58c9f..7e499a5 100644
--- a/test/cases/fhir-r4.yaml
+++ b/test/cases/fhir-r4.yaml
@@ -572,20 +572,44 @@ tests:
         expression: '''1 cm''.toQuantity(''\''g\'''')'
         result: []
       - desc: '** test'
+        inputfile: observation-example.json
+        model: 'r4'
+        expression: Observation.value.toQuantity('kg') ~ 84 'kg'
+        result:
+          - true
+      - desc: '** Converts ''a'' to year on transform FHIR Quantity to System.Quantity'
         inputfile: quantity-example.json
-        expression: Quantity.valueQuantity[0].toQuantity().unit
+        model: 'r4'
+        expression: QuestionnaireResponse.item[0].answer.value.toQuantity() = 2 year
         result:
-          - year
+          - true
       - desc: '** test'
         inputfile: quantity-example.json
-        expression: Quantity.valueQuantity[0].toQuantity().value
+        model: 'r4'
+        expression: QuestionnaireResponse.item[0].answer.value.toQuantity() ~ 2 'a'
         result:
-          - 2
+          - true
+      - desc: '** test'
+        inputfile: quantity-example.json
+        model: 'r4'
+        expression: QuestionnaireResponse.item[0].answer.value.toQuantity() != 2 'a'
+        result:
+          - true
       - desc: '** test'
         inputfile: quantity-example.json
-        expression: Quantity.valueQuantity[1].toQuantity() = 3 'min'
+        model: 'r4'
+        expression: QuestionnaireResponse.item[1].answer.value.toQuantity() = 3 'min'
         result:
           - true
+      - desc: '** Cant convert from FHIR Quantity without context'
+        inputfile: quantity-example.json
+        expression: QuestionnaireResponse.item[1].answer.value.toQuantity()
+        result: []
+      - desc: '** Not UCUM system ignored'
+        inputfile: quantity-example.json
+        model: 'r4'
+        expression: QuestionnaireResponse.item[2].answer.value.toQuantity()
+        result: []
       - desc: '** test'
         inputfile: patient-example.json
         expression: '''1 \''wk\''''.toQuantity(''nonexistent-unit'')'
diff --git a/test/resources/quantity-example.json b/test/resources/quantity-example.json
index 64da4d8..1db32a0 100644
--- a/test/resources/quantity-example.json
+++ b/test/resources/quantity-example.json
@@ -1,14 +1,31 @@
 {
-  "resourceType": "Quantity",
-  "valueQuantity": [{
-    "value": 2,
-    "unit": "year(real UCUM code in field 'code')",
-    "system": "http://unitsofmeasure.org",
-    "code": "a"
+  "resourceType": "QuestionnaireResponse",
+  "item": [{
+    "answer": {
+      "valueQuantity": {
+        "value": 2,
+        "unit": "year(real UCUM code in field 'code')",
+        "system": "http://unitsofmeasure.org",
+        "code": "a"
+      }
+    }
   },{
-    "value": 3,
-    "unit": "year(real UCUM code in field 'code')",
-    "system": "http://unitsofmeasure.org",
-    "code": "min"
+    "answer": {
+      "valueQuantity": {
+        "value": 3,
+        "unit": "year(real UCUM code in field 'code')",
+        "system": "http://unitsofmeasure.org",
+        "code": "min"
+      }
+    }
+  },{
+    "answer": {
+      "valueQuantity": {
+        "value": 3,
+        "unit": "year(real UCUM code in field 'code')",
+        "system": "http://othersystemofmeasure.org",
+        "code": "min"
+      }
+    }
   }]
 }
\ No newline at end of file

From 4518dd3cdbe58d009cf7325f02b101f73b875ce9 Mon Sep 17 00:00:00 2001
From: sedinkinya <yury.sedinkin@nih.gov>
Date: Thu, 26 Mar 2020 16:55:18 -0400
Subject: [PATCH 04/13] Fixes in comments

LF-1351
---
 src/types.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/types.js b/src/types.js
index cbc5ee4..6ccbe3d 100644
--- a/src/types.js
+++ b/src/types.js
@@ -71,13 +71,13 @@ class FP_Quantity extends FP_Type {
     if (!(otherQuantity instanceof this.constructor))
       return false;
 
-    // Special year/month comparision case: 1 year = 12 month
+    // Special year/month comparison case: 1 year = 12 month
     const compareYearsAndMonths = this._compareYearsAndMonths(otherQuantity);
     if (compareYearsAndMonths) {
       return compareYearsAndMonths.isEqual;
     }
 
-    // General comparision case
+    // General comparison case
     const thisQuantity = FP_Quantity.toUcumQuantity(this.value, this.unit),
       normalizedOtherQuantity = FP_Quantity.toUcumQuantity(otherQuantity.value, otherQuantity.unit),
       convResult = ucumUtils.convertUnitTo(normalizedOtherQuantity.unit, normalizedOtherQuantity.value, thisQuantity.unit);
@@ -146,7 +146,7 @@ FP_Quantity.getEquivalentUcumUnitCode = function (unit) {
 };
 
 /**
- * Converts FHIR path value/unit to UCUM value/unit. Usable for comparision.
+ * Converts FHIR path value/unit to UCUM value/unit. Usable for comparison.
  * @param {number} value
  * @param {string} unit
  * @returns { {value: number, unit: string} }

From 803e52b1da50b0fe7863fda0792ed8c9ea2dbfc8 Mon Sep 17 00:00:00 2001
From: sedinkinya <yury.sedinkin@nih.gov>
Date: Thu, 26 Mar 2020 17:24:12 -0400
Subject: [PATCH 05/13] Minor optimizations

LF-1351
---
 src/misc.js  |  2 +-
 src/types.js | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/misc.js b/src/misc.js
index c452577..e73c3c1 100644
--- a/src/misc.js
+++ b/src/misc.js
@@ -69,7 +69,7 @@ engine.toQuantity = function (coll, toUnit) {
       result = new FP_Quantity(Number(value), unit||time||'\'1\'');
     }
 
-    if (result && toUnit) {
+    if (result && toUnit && result.unit !== toUnit) {
       result = FP_Quantity.convUnitTo(result.unit, result.value, toUnit) || [];
     }
   }
diff --git a/src/types.js b/src/types.js
index 6ccbe3d..a10a0eb 100644
--- a/src/types.js
+++ b/src/types.js
@@ -68,8 +68,13 @@ class FP_Quantity extends FP_Type {
   }
 
   equals(otherQuantity) {
-    if (!(otherQuantity instanceof this.constructor))
+    if (!(otherQuantity instanceof this.constructor)) {
       return false;
+    }
+
+    if (this.unit === otherQuantity.unit) {
+      return numbers.isEqual(this.value, otherQuantity.value);
+    }
 
     // Special year/month comparison case: 1 year = 12 month
     const compareYearsAndMonths = this._compareYearsAndMonths(otherQuantity);
@@ -90,8 +95,13 @@ class FP_Quantity extends FP_Type {
   }
 
   equivalentTo(otherQuantity) {
-    if (!(otherQuantity instanceof this.constructor))
+    if (!(otherQuantity instanceof this.constructor)) {
       return false;
+    }
+
+    if (this.unit === otherQuantity.unit) {
+      return numbers.isEquivalent(this.value, otherQuantity.value);
+    }
 
     const ucumUnitCode = FP_Quantity.getEquivalentUcumUnitCode(this.unit),
       otherUcumUnitCode = FP_Quantity.getEquivalentUcumUnitCode(otherQuantity.unit),

From dad008dd52a47df4353cfed2e8b1f533734f0f27 Mon Sep 17 00:00:00 2001
From: sedinkinya <yury.sedinkin@nih.gov>
Date: Thu, 26 Mar 2020 17:54:51 -0400
Subject: [PATCH 06/13] CHANGELOG.md and minor changes

---
 CHANGELOG.md      |   5 +
 package-lock.json | 880 ++++++++++++++++++++++++++--------------------
 package.json      |   4 +-
 src/types.js      |  10 +-
 4 files changed, 501 insertions(+), 398 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c0ecf15..e58d6eb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,11 @@
 This log documents significant changes for each release.  This project follows
 [Semantic Versioning](http://semver.org/).
 
+## [2.1.0] - 2020-03-26
+### Added
+- Function toQuantity(unit)
+- Operators =(equality) and ~(equivalence) for Quantity
+
 ## [2.0.0] - 2020-03-11
 ### Changed
 - FHIRPath grammar updated to version 2.0.0 (N1)
diff --git a/package-lock.json b/package-lock.json
index ac935db..ec696eb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "fhirpath",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -14,33 +14,34 @@
       }
     },
     "@babel/compat-data": {
-      "version": "7.8.6",
-      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.8.6.tgz",
-      "integrity": "sha512-CurCIKPTkS25Mb8mz267vU95vy+TyUpnctEX2lV33xWNmHAfjruztgiPBbXZRh3xZZy1CYvGx6XfxyTVS+sk7Q==",
+      "version": "7.9.0",
+      "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.9.0.tgz",
+      "integrity": "sha512-zeFQrr+284Ekvd9e7KAX954LkapWiOmQtsfHirhxqfdlX6MEC32iRE+pqUGlYIBchdevaCwvzxWGSy/YBNI85g==",
       "dev": true,
       "requires": {
-        "browserslist": "^4.8.5",
+        "browserslist": "^4.9.1",
         "invariant": "^2.2.4",
         "semver": "^5.5.0"
       }
     },
     "@babel/core": {
-      "version": "7.8.7",
-      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.8.7.tgz",
-      "integrity": "sha512-rBlqF3Yko9cynC5CCFy6+K/w2N+Sq/ff2BPy+Krp7rHlABIr5epbA7OxVeKoMHB39LZOp1UY5SuLjy6uWi35yA==",
+      "version": "7.9.0",
+      "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.9.0.tgz",
+      "integrity": "sha512-kWc7L0fw1xwvI0zi8OKVBuxRVefwGOrKSQMvrQ3dW+bIIavBY3/NpXmpjMy7bQnLgwgzWQZ8TlM57YHpHNHz4w==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.8.3",
-        "@babel/generator": "^7.8.7",
-        "@babel/helpers": "^7.8.4",
-        "@babel/parser": "^7.8.7",
+        "@babel/generator": "^7.9.0",
+        "@babel/helper-module-transforms": "^7.9.0",
+        "@babel/helpers": "^7.9.0",
+        "@babel/parser": "^7.9.0",
         "@babel/template": "^7.8.6",
-        "@babel/traverse": "^7.8.6",
-        "@babel/types": "^7.8.7",
+        "@babel/traverse": "^7.9.0",
+        "@babel/types": "^7.9.0",
         "convert-source-map": "^1.7.0",
         "debug": "^4.1.0",
         "gensync": "^1.0.0-beta.1",
-        "json5": "^2.1.0",
+        "json5": "^2.1.2",
         "lodash": "^4.17.13",
         "resolve": "^1.3.2",
         "semver": "^5.4.1",
@@ -65,12 +66,12 @@
       }
     },
     "@babel/generator": {
-      "version": "7.8.7",
-      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.8.7.tgz",
-      "integrity": "sha512-DQwjiKJqH4C3qGiyQCAExJHoZssn49JTMJgZ8SANGgVFdkupcUhLOdkAeoC6kmHZCPfoDG5M0b6cFlSN5wW7Ew==",
+      "version": "7.9.4",
+      "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.9.4.tgz",
+      "integrity": "sha512-rjP8ahaDy/ouhrvCoU1E5mqaitWrxwuNGU+dy1EpaoK48jZay4MdkskKGIMHLZNewg8sAsqpGSREJwP0zH3YQA==",
       "dev": true,
       "requires": {
-        "@babel/types": "^7.8.7",
+        "@babel/types": "^7.9.0",
         "jsesc": "^2.5.1",
         "lodash": "^4.17.13",
         "source-map": "^0.5.0"
@@ -95,17 +96,6 @@
         "@babel/types": "^7.8.3"
       }
     },
-    "@babel/helper-call-delegate": {
-      "version": "7.8.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-call-delegate/-/helper-call-delegate-7.8.7.tgz",
-      "integrity": "sha512-doAA5LAKhsFCR0LAFIf+r2RSMmC+m8f/oQ+URnUET/rWeEzC0yTRmAGyWkD4sSu3xwbS7MYQ2u+xlt1V5R56KQ==",
-      "dev": true,
-      "requires": {
-        "@babel/helper-hoist-variables": "^7.8.3",
-        "@babel/traverse": "^7.8.3",
-        "@babel/types": "^7.8.7"
-      }
-    },
     "@babel/helper-compilation-targets": {
       "version": "7.8.7",
       "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.8.7.tgz",
@@ -120,14 +110,14 @@
       }
     },
     "@babel/helper-create-regexp-features-plugin": {
-      "version": "7.8.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.6.tgz",
-      "integrity": "sha512-bPyujWfsHhV/ztUkwGHz/RPV1T1TDEsSZDsN42JPehndA+p1KKTh3npvTadux0ZhCrytx9tvjpWNowKby3tM6A==",
+      "version": "7.8.8",
+      "resolved": "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.8.tgz",
+      "integrity": "sha512-LYVPdwkrQEiX9+1R29Ld/wTrmQu1SSKYnuOk3g0CkcZMA1p0gsNxJFj/3gBdaJ7Cg0Fnek5z0DsMULePP7Lrqg==",
       "dev": true,
       "requires": {
         "@babel/helper-annotate-as-pure": "^7.8.3",
         "@babel/helper-regex": "^7.8.3",
-        "regexpu-core": "^4.6.0"
+        "regexpu-core": "^4.7.0"
       }
     },
     "@babel/helper-define-map": {
@@ -199,9 +189,9 @@
       }
     },
     "@babel/helper-module-transforms": {
-      "version": "7.8.6",
-      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.8.6.tgz",
-      "integrity": "sha512-RDnGJSR5EFBJjG3deY0NiL0K9TO8SXxS9n/MPsbPK/s9LbQymuLNtlzvDiNS7IpecuL45cMeLVkA+HfmlrnkRg==",
+      "version": "7.9.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.9.0.tgz",
+      "integrity": "sha512-0FvKyu0gpPfIQ8EkxlrAydOWROdHpBmiCiRwLkUiBGhCUPRRbVD2/tm3sFr/c/GWFrQ/ffutGUAnx7V0FzT2wA==",
       "dev": true,
       "requires": {
         "@babel/helper-module-imports": "^7.8.3",
@@ -209,7 +199,7 @@
         "@babel/helper-simple-access": "^7.8.3",
         "@babel/helper-split-export-declaration": "^7.8.3",
         "@babel/template": "^7.8.6",
-        "@babel/types": "^7.8.6",
+        "@babel/types": "^7.9.0",
         "lodash": "^4.17.13"
       }
     },
@@ -281,6 +271,12 @@
         "@babel/types": "^7.8.3"
       }
     },
+    "@babel/helper-validator-identifier": {
+      "version": "7.9.0",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.0.tgz",
+      "integrity": "sha512-6G8bQKjOh+of4PV/ThDm/rRqlU7+IGoJuofpagU5GlEl29Vv0RGqqt86ZGRV8ZuSOY3o+8yXl5y782SMcG7SHw==",
+      "dev": true
+    },
     "@babel/helper-wrap-function": {
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.8.3.tgz",
@@ -294,31 +290,31 @@
       }
     },
     "@babel/helpers": {
-      "version": "7.8.4",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.8.4.tgz",
-      "integrity": "sha512-VPbe7wcQ4chu4TDQjimHv/5tj73qz88o12EPkO2ValS2QiQS/1F2SsjyIGNnAD0vF/nZS6Cf9i+vW6HIlnaR8w==",
+      "version": "7.9.2",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.9.2.tgz",
+      "integrity": "sha512-JwLvzlXVPjO8eU9c/wF9/zOIN7X6h8DYf7mG4CiFRZRvZNKEF5dQ3H3V+ASkHoIB3mWhatgl5ONhyqHRI6MppA==",
       "dev": true,
       "requires": {
         "@babel/template": "^7.8.3",
-        "@babel/traverse": "^7.8.4",
-        "@babel/types": "^7.8.3"
+        "@babel/traverse": "^7.9.0",
+        "@babel/types": "^7.9.0"
       }
     },
     "@babel/highlight": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.8.3.tgz",
-      "integrity": "sha512-PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg==",
+      "version": "7.9.0",
+      "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.9.0.tgz",
+      "integrity": "sha512-lJZPilxX7Op3Nv/2cvFdnlepPXDxi29wxteT57Q965oc5R9v86ztx0jfxVrTcBk8C2kcPkkDa2Z4T3ZsPPVWsQ==",
       "dev": true,
       "requires": {
+        "@babel/helper-validator-identifier": "^7.9.0",
         "chalk": "^2.0.0",
-        "esutils": "^2.0.2",
         "js-tokens": "^4.0.0"
       }
     },
     "@babel/parser": {
-      "version": "7.8.7",
-      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.8.7.tgz",
-      "integrity": "sha512-9JWls8WilDXFGxs0phaXAZgpxTZhSk/yOYH2hTHC0X1yC7Z78IJfvR1vJ+rmJKq3I35td2XzXzN6ZLYlna+r/A==",
+      "version": "7.9.4",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.9.4.tgz",
+      "integrity": "sha512-bC49otXX6N0/VYhgOMh4gnP26E9xnDZK3TmbNpxYzzz9BQLBosQwfyOe9/cXUU3txYhTzLCbcqd5c8y/OmCjHA==",
       "dev": true
     },
     "@babel/plugin-proposal-async-generator-functions": {
@@ -362,10 +358,20 @@
         "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0"
       }
     },
-    "@babel/plugin-proposal-object-rest-spread": {
+    "@babel/plugin-proposal-numeric-separator": {
       "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.8.3.tgz",
-      "integrity": "sha512-8qvuPwU/xxUCt78HocNlv0mXXo0wdh9VT1R04WU8HGOfaOob26pF+9P5/lYjN/q7DHOX1bvX60hnhOvuQUJdbA==",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.8.3.tgz",
+      "integrity": "sha512-jWioO1s6R/R+wEHizfaScNsAx+xKgwTLNXSh7tTC4Usj3ItsPEhYkEpU4h+lpnBwq7NBVOJXfO6cRFYcX69JUQ==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.3",
+        "@babel/plugin-syntax-numeric-separator": "^7.8.3"
+      }
+    },
+    "@babel/plugin-proposal-object-rest-spread": {
+      "version": "7.9.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.0.tgz",
+      "integrity": "sha512-UgqBv6bjq4fDb8uku9f+wcm1J7YxJ5nT7WO/jBr0cl0PLKb7t1O6RNR1kZbjgx2LQtsDI9hwoQVmn0yhXeQyow==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.8.3",
@@ -383,9 +389,9 @@
       }
     },
     "@babel/plugin-proposal-optional-chaining": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.8.3.tgz",
-      "integrity": "sha512-QIoIR9abkVn+seDE3OjA08jWcs3eZ9+wJCKSRgo3WdEU2csFYgdScb+8qHB3+WXsGJD55u+5hWCISI7ejXS+kg==",
+      "version": "7.9.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.9.0.tgz",
+      "integrity": "sha512-NDn5tu3tcv4W30jNhmc2hyD5c56G6cXx4TesJubhxrJeCvuuMpttxr0OnNCqbZGhFjLrg+NIhxxC+BK5F6yS3w==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.8.3",
@@ -393,12 +399,12 @@
       }
     },
     "@babel/plugin-proposal-unicode-property-regex": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.3.tgz",
-      "integrity": "sha512-1/1/rEZv2XGweRwwSkLpY+s60za9OZ1hJs4YDqFHCw0kYWYwL5IFljVY1MYBL+weT1l9pokDO2uhSTLVxzoHkQ==",
+      "version": "7.8.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.8.tgz",
+      "integrity": "sha512-EVhjVsMpbhLw9ZfHWSx2iy13Q8Z/eg8e8ccVWt23sWQK5l1UdkoLJPN5w69UA4uITGBnEZD2JOe4QOHycYKv8A==",
       "dev": true,
       "requires": {
-        "@babel/helper-create-regexp-features-plugin": "^7.8.3",
+        "@babel/helper-create-regexp-features-plugin": "^7.8.8",
         "@babel/helper-plugin-utils": "^7.8.3"
       }
     },
@@ -438,6 +444,15 @@
         "@babel/helper-plugin-utils": "^7.8.0"
       }
     },
+    "@babel/plugin-syntax-numeric-separator": {
+      "version": "7.8.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.8.3.tgz",
+      "integrity": "sha512-H7dCMAdN83PcCmqmkHB5dtp+Xa9a6LKSvA2hiFBC/5alSHxM5VgWZXFqDi0YFe8XNGT6iCa+z4V4zSt/PdZ7Dw==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.8.3"
+      }
+    },
     "@babel/plugin-syntax-object-rest-spread": {
       "version": "7.8.3",
       "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-object-rest-spread/-/plugin-syntax-object-rest-spread-7.8.3.tgz",
@@ -514,9 +529,9 @@
       }
     },
     "@babel/plugin-transform-classes": {
-      "version": "7.8.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.8.6.tgz",
-      "integrity": "sha512-k9r8qRay/R6v5aWZkrEclEhKO6mc1CCQr2dLsVHBmOQiMpN6I2bpjX3vgnldUWeEI1GHVNByULVxZ4BdP4Hmdg==",
+      "version": "7.9.2",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.9.2.tgz",
+      "integrity": "sha512-TC2p3bPzsfvSsqBZo0kJnuelnoK9O3welkUpqSqBQuBF6R5MN2rysopri8kNvtlGIb2jmUO7i15IooAZJjZuMQ==",
       "dev": true,
       "requires": {
         "@babel/helper-annotate-as-pure": "^7.8.3",
@@ -539,9 +554,9 @@
       }
     },
     "@babel/plugin-transform-destructuring": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.8.3.tgz",
-      "integrity": "sha512-H4X646nCkiEcHZUZaRkhE2XVsoz0J/1x3VVujnn96pSoGCtKPA99ZZA+va+gK+92Zycd6OBKCD8tDb/731bhgQ==",
+      "version": "7.8.8",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.8.8.tgz",
+      "integrity": "sha512-eRJu4Vs2rmttFCdhPUM3bV0Yo/xPSdPw6ML9KHs/bjB4bLA5HXlbvYXPOD5yASodGod+krjYx21xm1QmL8dCJQ==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.8.3"
@@ -577,9 +592,9 @@
       }
     },
     "@babel/plugin-transform-for-of": {
-      "version": "7.8.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.8.6.tgz",
-      "integrity": "sha512-M0pw4/1/KI5WAxPsdcUL/w2LJ7o89YHN3yLkzNjg7Yl15GlVGgzHyCU+FMeAxevHGsLVmUqbirlUIKTafPmzdw==",
+      "version": "7.9.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.9.0.tgz",
+      "integrity": "sha512-lTAnWOpMwOXpyDx06N+ywmF3jNbafZEqZ96CGYabxHrxNX8l5ny7dt4bK/rGwAh9utyP2b2Hv7PlZh1AAS54FQ==",
       "dev": true,
       "requires": {
         "@babel/helper-plugin-utils": "^7.8.3"
@@ -614,47 +629,47 @@
       }
     },
     "@babel/plugin-transform-modules-amd": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.8.3.tgz",
-      "integrity": "sha512-MadJiU3rLKclzT5kBH4yxdry96odTUwuqrZM+GllFI/VhxfPz+k9MshJM+MwhfkCdxxclSbSBbUGciBngR+kEQ==",
+      "version": "7.9.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.9.0.tgz",
+      "integrity": "sha512-vZgDDF003B14O8zJy0XXLnPH4sg+9X5hFBBGN1V+B2rgrB+J2xIypSN6Rk9imB2hSTHQi5OHLrFWsZab1GMk+Q==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-transforms": "^7.8.3",
+        "@babel/helper-module-transforms": "^7.9.0",
         "@babel/helper-plugin-utils": "^7.8.3",
         "babel-plugin-dynamic-import-node": "^2.3.0"
       }
     },
     "@babel/plugin-transform-modules-commonjs": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.8.3.tgz",
-      "integrity": "sha512-JpdMEfA15HZ/1gNuB9XEDlZM1h/gF/YOH7zaZzQu2xCFRfwc01NXBMHHSTT6hRjlXJJs5x/bfODM3LiCk94Sxg==",
+      "version": "7.9.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.0.tgz",
+      "integrity": "sha512-qzlCrLnKqio4SlgJ6FMMLBe4bySNis8DFn1VkGmOcxG9gqEyPIOzeQrA//u0HAKrWpJlpZbZMPB1n/OPa4+n8g==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-transforms": "^7.8.3",
+        "@babel/helper-module-transforms": "^7.9.0",
         "@babel/helper-plugin-utils": "^7.8.3",
         "@babel/helper-simple-access": "^7.8.3",
         "babel-plugin-dynamic-import-node": "^2.3.0"
       }
     },
     "@babel/plugin-transform-modules-systemjs": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.8.3.tgz",
-      "integrity": "sha512-8cESMCJjmArMYqa9AO5YuMEkE4ds28tMpZcGZB/jl3n0ZzlsxOAi3mC+SKypTfT8gjMupCnd3YiXCkMjj2jfOg==",
+      "version": "7.9.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.9.0.tgz",
+      "integrity": "sha512-FsiAv/nao/ud2ZWy4wFacoLOm5uxl0ExSQ7ErvP7jpoihLR6Cq90ilOFyX9UXct3rbtKsAiZ9kFt5XGfPe/5SQ==",
       "dev": true,
       "requires": {
         "@babel/helper-hoist-variables": "^7.8.3",
-        "@babel/helper-module-transforms": "^7.8.3",
+        "@babel/helper-module-transforms": "^7.9.0",
         "@babel/helper-plugin-utils": "^7.8.3",
         "babel-plugin-dynamic-import-node": "^2.3.0"
       }
     },
     "@babel/plugin-transform-modules-umd": {
-      "version": "7.8.3",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.8.3.tgz",
-      "integrity": "sha512-evhTyWhbwbI3/U6dZAnx/ePoV7H6OUG+OjiJFHmhr9FPn0VShjwC2kdxqIuQ/+1P50TMrneGzMeyMTFOjKSnAw==",
+      "version": "7.9.0",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.9.0.tgz",
+      "integrity": "sha512-uTWkXkIVtg/JGRSIABdBoMsoIeoHQHPTL0Y2E7xf5Oj7sLqwVsNXOkNk0VJc7vF0IMBsPeikHxFjGe+qmwPtTQ==",
       "dev": true,
       "requires": {
-        "@babel/helper-module-transforms": "^7.8.3",
+        "@babel/helper-module-transforms": "^7.9.0",
         "@babel/helper-plugin-utils": "^7.8.3"
       }
     },
@@ -687,12 +702,11 @@
       }
     },
     "@babel/plugin-transform-parameters": {
-      "version": "7.8.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.8.7.tgz",
-      "integrity": "sha512-brYWaEPTRimOctz2NDA3jnBbDi7SVN2T4wYuu0aqSzxC3nozFZngGaw29CJ9ZPweB7k+iFmZuoG3IVPIcXmD2g==",
+      "version": "7.9.3",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.9.3.tgz",
+      "integrity": "sha512-fzrQFQhp7mIhOzmOtPiKffvCYQSK10NR8t6BBz2yPbeUHb9OLW8RZGtgDRBn8z2hGcwvKDL3vC7ojPTLNxmqEg==",
       "dev": true,
       "requires": {
-        "@babel/helper-call-delegate": "^7.8.7",
         "@babel/helper-get-function-arity": "^7.8.3",
         "@babel/helper-plugin-utils": "^7.8.3"
       }
@@ -792,12 +806,12 @@
       }
     },
     "@babel/preset-env": {
-      "version": "7.8.7",
-      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.8.7.tgz",
-      "integrity": "sha512-BYftCVOdAYJk5ASsznKAUl53EMhfBbr8CJ1X+AJLfGPscQkwJFiaV/Wn9DPH/7fzm2v6iRYJKYHSqyynTGw0nw==",
+      "version": "7.9.0",
+      "resolved": "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.9.0.tgz",
+      "integrity": "sha512-712DeRXT6dyKAM/FMbQTV/FvRCms2hPCx+3weRjZ8iQVQWZejWWk1wwG6ViWMyqb/ouBbGOl5b6aCk0+j1NmsQ==",
       "dev": true,
       "requires": {
-        "@babel/compat-data": "^7.8.6",
+        "@babel/compat-data": "^7.9.0",
         "@babel/helper-compilation-targets": "^7.8.7",
         "@babel/helper-module-imports": "^7.8.3",
         "@babel/helper-plugin-utils": "^7.8.3",
@@ -805,14 +819,16 @@
         "@babel/plugin-proposal-dynamic-import": "^7.8.3",
         "@babel/plugin-proposal-json-strings": "^7.8.3",
         "@babel/plugin-proposal-nullish-coalescing-operator": "^7.8.3",
-        "@babel/plugin-proposal-object-rest-spread": "^7.8.3",
+        "@babel/plugin-proposal-numeric-separator": "^7.8.3",
+        "@babel/plugin-proposal-object-rest-spread": "^7.9.0",
         "@babel/plugin-proposal-optional-catch-binding": "^7.8.3",
-        "@babel/plugin-proposal-optional-chaining": "^7.8.3",
+        "@babel/plugin-proposal-optional-chaining": "^7.9.0",
         "@babel/plugin-proposal-unicode-property-regex": "^7.8.3",
         "@babel/plugin-syntax-async-generators": "^7.8.0",
         "@babel/plugin-syntax-dynamic-import": "^7.8.0",
         "@babel/plugin-syntax-json-strings": "^7.8.0",
         "@babel/plugin-syntax-nullish-coalescing-operator": "^7.8.0",
+        "@babel/plugin-syntax-numeric-separator": "^7.8.0",
         "@babel/plugin-syntax-object-rest-spread": "^7.8.0",
         "@babel/plugin-syntax-optional-catch-binding": "^7.8.0",
         "@babel/plugin-syntax-optional-chaining": "^7.8.0",
@@ -821,20 +837,20 @@
         "@babel/plugin-transform-async-to-generator": "^7.8.3",
         "@babel/plugin-transform-block-scoped-functions": "^7.8.3",
         "@babel/plugin-transform-block-scoping": "^7.8.3",
-        "@babel/plugin-transform-classes": "^7.8.6",
+        "@babel/plugin-transform-classes": "^7.9.0",
         "@babel/plugin-transform-computed-properties": "^7.8.3",
         "@babel/plugin-transform-destructuring": "^7.8.3",
         "@babel/plugin-transform-dotall-regex": "^7.8.3",
         "@babel/plugin-transform-duplicate-keys": "^7.8.3",
         "@babel/plugin-transform-exponentiation-operator": "^7.8.3",
-        "@babel/plugin-transform-for-of": "^7.8.6",
+        "@babel/plugin-transform-for-of": "^7.9.0",
         "@babel/plugin-transform-function-name": "^7.8.3",
         "@babel/plugin-transform-literals": "^7.8.3",
         "@babel/plugin-transform-member-expression-literals": "^7.8.3",
-        "@babel/plugin-transform-modules-amd": "^7.8.3",
-        "@babel/plugin-transform-modules-commonjs": "^7.8.3",
-        "@babel/plugin-transform-modules-systemjs": "^7.8.3",
-        "@babel/plugin-transform-modules-umd": "^7.8.3",
+        "@babel/plugin-transform-modules-amd": "^7.9.0",
+        "@babel/plugin-transform-modules-commonjs": "^7.9.0",
+        "@babel/plugin-transform-modules-systemjs": "^7.9.0",
+        "@babel/plugin-transform-modules-umd": "^7.9.0",
         "@babel/plugin-transform-named-capturing-groups-regex": "^7.8.3",
         "@babel/plugin-transform-new-target": "^7.8.3",
         "@babel/plugin-transform-object-super": "^7.8.3",
@@ -848,18 +864,32 @@
         "@babel/plugin-transform-template-literals": "^7.8.3",
         "@babel/plugin-transform-typeof-symbol": "^7.8.4",
         "@babel/plugin-transform-unicode-regex": "^7.8.3",
-        "@babel/types": "^7.8.7",
-        "browserslist": "^4.8.5",
+        "@babel/preset-modules": "^0.1.3",
+        "@babel/types": "^7.9.0",
+        "browserslist": "^4.9.1",
         "core-js-compat": "^3.6.2",
         "invariant": "^2.2.2",
         "levenary": "^1.1.1",
         "semver": "^5.5.0"
       }
     },
+    "@babel/preset-modules": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@babel/preset-modules/-/preset-modules-0.1.3.tgz",
+      "integrity": "sha512-Ra3JXOHBq2xd56xSF7lMKXdjBn3T772Y1Wet3yWnkDly9zHvJki029tAFzvAAK5cf4YV3yoxuP61crYRol6SVg==",
+      "dev": true,
+      "requires": {
+        "@babel/helper-plugin-utils": "^7.0.0",
+        "@babel/plugin-proposal-unicode-property-regex": "^7.4.4",
+        "@babel/plugin-transform-dotall-regex": "^7.4.4",
+        "@babel/types": "^7.4.4",
+        "esutils": "^2.0.2"
+      }
+    },
     "@babel/runtime": {
-      "version": "7.8.7",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.8.7.tgz",
-      "integrity": "sha512-+AATMUFppJDw6aiR5NVPHqIQBlV/Pj8wY/EZH+lmvRdUo9xBaz/rF3alAwFJQavvKfeOlPE7oaaDHVbcySbCsg==",
+      "version": "7.9.2",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.9.2.tgz",
+      "integrity": "sha512-NE2DtOdufG7R5vnfQUTehdTfNycfUANEtCa9PssN9O/xmTzP4E08UI797ixaei6hBEVL9BI/PsdJS5x7mWoB9Q==",
       "dev": true,
       "requires": {
         "regenerator-runtime": "^0.13.4"
@@ -877,17 +907,17 @@
       }
     },
     "@babel/traverse": {
-      "version": "7.8.6",
-      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.8.6.tgz",
-      "integrity": "sha512-2B8l0db/DPi8iinITKuo7cbPznLCEk0kCxDoB9/N6gGNg/gxOXiR/IcymAFPiBwk5w6TtQ27w4wpElgp9btR9A==",
+      "version": "7.9.0",
+      "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.9.0.tgz",
+      "integrity": "sha512-jAZQj0+kn4WTHO5dUZkZKhbFrqZE7K5LAQ5JysMnmvGij+wOdr+8lWqPeW0BcF4wFwrEXXtdGO7wcV6YPJcf3w==",
       "dev": true,
       "requires": {
         "@babel/code-frame": "^7.8.3",
-        "@babel/generator": "^7.8.6",
+        "@babel/generator": "^7.9.0",
         "@babel/helper-function-name": "^7.8.3",
         "@babel/helper-split-export-declaration": "^7.8.3",
-        "@babel/parser": "^7.8.6",
-        "@babel/types": "^7.8.6",
+        "@babel/parser": "^7.9.0",
+        "@babel/types": "^7.9.0",
         "debug": "^4.1.0",
         "globals": "^11.1.0",
         "lodash": "^4.17.13"
@@ -911,12 +941,12 @@
       }
     },
     "@babel/types": {
-      "version": "7.8.7",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.8.7.tgz",
-      "integrity": "sha512-k2TreEHxFA4CjGkL+GYjRyx35W0Mr7DP5+9q6WMkyKXB+904bYmG40syjMFV0oLlhhFCwWl0vA0DyzTDkwAiJw==",
+      "version": "7.9.0",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.9.0.tgz",
+      "integrity": "sha512-BS9JKfXkzzJl8RluW4JGknzpiUV7ZrvTayM6yfqLTVBEnFtyowVIOu6rqxRd5cVO6yGoWf4T8u8dgK9oB+GCng==",
       "dev": true,
       "requires": {
-        "esutils": "^2.0.2",
+        "@babel/helper-validator-identifier": "^7.9.0",
         "lodash": "^4.17.13",
         "to-fast-properties": "^2.0.0"
       }
@@ -1284,178 +1314,177 @@
       "dev": true
     },
     "@webassemblyjs/ast": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.8.5.tgz",
-      "integrity": "sha512-aJMfngIZ65+t71C3y2nBBg5FFG0Okt9m0XEgWZ7Ywgn1oMAT8cNwx00Uv1cQyHtidq0Xn94R4TAywO+LCQ+ZAQ==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.9.0.tgz",
+      "integrity": "sha512-C6wW5L+b7ogSDVqymbkkvuW9kruN//YisMED04xzeBBqjHa2FYnmvOlS6Xj68xWQRgWvI9cIglsjFowH/RJyEA==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/helper-module-context": "1.8.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-        "@webassemblyjs/wast-parser": "1.8.5"
+        "@webassemblyjs/helper-module-context": "1.9.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
+        "@webassemblyjs/wast-parser": "1.9.0"
       }
     },
     "@webassemblyjs/floating-point-hex-parser": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.8.5.tgz",
-      "integrity": "sha512-9p+79WHru1oqBh9ewP9zW95E3XAo+90oth7S5Re3eQnECGq59ly1Ri5tsIipKGpiStHsUYmY3zMLqtk3gTcOtQ==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.9.0.tgz",
+      "integrity": "sha512-TG5qcFsS8QB4g4MhrxK5TqfdNe7Ey/7YL/xN+36rRjl/BlGE/NcBvJcqsRgCP6Z92mRE+7N50pRIi8SmKUbcQA==",
       "dev": true
     },
     "@webassemblyjs/helper-api-error": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.8.5.tgz",
-      "integrity": "sha512-Za/tnzsvnqdaSPOUXHyKJ2XI7PDX64kWtURyGiJJZKVEdFOsdKUCPTNEVFZq3zJ2R0G5wc2PZ5gvdTRFgm81zA==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.9.0.tgz",
+      "integrity": "sha512-NcMLjoFMXpsASZFxJ5h2HZRcEhDkvnNFOAKneP5RbKRzaWJN36NC4jqQHKwStIhGXu5mUWlUUk7ygdtrO8lbmw==",
       "dev": true
     },
     "@webassemblyjs/helper-buffer": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.8.5.tgz",
-      "integrity": "sha512-Ri2R8nOS0U6G49Q86goFIPNgjyl6+oE1abW1pS84BuhP1Qcr5JqMwRFT3Ah3ADDDYGEgGs1iyb1DGX+kAi/c/Q==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.9.0.tgz",
+      "integrity": "sha512-qZol43oqhq6yBPx7YM3m9Bv7WMV9Eevj6kMi6InKOuZxhw+q9hOkvq5e/PpKSiLfyetpaBnogSbNCfBwyB00CA==",
       "dev": true
     },
     "@webassemblyjs/helper-code-frame": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.8.5.tgz",
-      "integrity": "sha512-VQAadSubZIhNpH46IR3yWO4kZZjMxN1opDrzePLdVKAZ+DFjkGD/rf4v1jap744uPVU6yjL/smZbRIIJTOUnKQ==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-code-frame/-/helper-code-frame-1.9.0.tgz",
+      "integrity": "sha512-ERCYdJBkD9Vu4vtjUYe8LZruWuNIToYq/ME22igL+2vj2dQ2OOujIZr3MEFvfEaqKoVqpsFKAGsRdBSBjrIvZA==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/wast-printer": "1.8.5"
+        "@webassemblyjs/wast-printer": "1.9.0"
       }
     },
     "@webassemblyjs/helper-fsm": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.8.5.tgz",
-      "integrity": "sha512-kRuX/saORcg8se/ft6Q2UbRpZwP4y7YrWsLXPbbmtepKr22i8Z4O3V5QE9DbZK908dh5Xya4Un57SDIKwB9eow==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-fsm/-/helper-fsm-1.9.0.tgz",
+      "integrity": "sha512-OPRowhGbshCb5PxJ8LocpdX9Kl0uB4XsAjl6jH/dWKlk/mzsANvhwbiULsaiqT5GZGT9qinTICdj6PLuM5gslw==",
       "dev": true
     },
     "@webassemblyjs/helper-module-context": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.8.5.tgz",
-      "integrity": "sha512-/O1B236mN7UNEU4t9X7Pj38i4VoU8CcMHyy3l2cV/kIF4U5KoHXDVqcDuOs1ltkac90IM4vZdHc52t1x8Yfs3g==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-module-context/-/helper-module-context-1.9.0.tgz",
+      "integrity": "sha512-MJCW8iGC08tMk2enck1aPW+BE5Cw8/7ph/VGZxwyvGbJwjktKkDK7vy7gAmMDx88D7mhDTCNKAW5tED+gZ0W8g==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "mamacro": "^0.0.3"
+        "@webassemblyjs/ast": "1.9.0"
       }
     },
     "@webassemblyjs/helper-wasm-bytecode": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.8.5.tgz",
-      "integrity": "sha512-Cu4YMYG3Ddl72CbmpjU/wbP6SACcOPVbHN1dI4VJNJVgFwaKf1ppeFJrwydOG3NDHxVGuCfPlLZNyEdIYlQ6QQ==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.9.0.tgz",
+      "integrity": "sha512-R7FStIzyNcd7xKxCZH5lE0Bqy+hGTwS3LJjuv1ZVxd9O7eHCedSdrId/hMOd20I+v8wDXEn+bjfKDLzTepoaUw==",
       "dev": true
     },
     "@webassemblyjs/helper-wasm-section": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.8.5.tgz",
-      "integrity": "sha512-VV083zwR+VTrIWWtgIUpqfvVdK4ff38loRmrdDBgBT8ADXYsEZ5mPQ4Nde90N3UYatHdYoDIFb7oHzMncI02tA==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.9.0.tgz",
+      "integrity": "sha512-XnMB8l3ek4tvrKUUku+IVaXNHz2YsJyOOmz+MMkZvh8h1uSJpSen6vYnw3IoQ7WwEuAhL8Efjms1ZWjqh2agvw==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/helper-buffer": "1.8.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-        "@webassemblyjs/wasm-gen": "1.8.5"
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-buffer": "1.9.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
+        "@webassemblyjs/wasm-gen": "1.9.0"
       }
     },
     "@webassemblyjs/ieee754": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.8.5.tgz",
-      "integrity": "sha512-aaCvQYrvKbY/n6wKHb/ylAJr27GglahUO89CcGXMItrOBqRarUMxWLJgxm9PJNuKULwN5n1csT9bYoMeZOGF3g==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.9.0.tgz",
+      "integrity": "sha512-dcX8JuYU/gvymzIHc9DgxTzUUTLexWwt8uCTWP3otys596io0L5aW02Gb1RjYpx2+0Jus1h4ZFqjla7umFniTg==",
       "dev": true,
       "requires": {
         "@xtuc/ieee754": "^1.2.0"
       }
     },
     "@webassemblyjs/leb128": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.8.5.tgz",
-      "integrity": "sha512-plYUuUwleLIziknvlP8VpTgO4kqNaH57Y3JnNa6DLpu/sGcP6hbVdfdX5aHAV716pQBKrfuU26BJK29qY37J7A==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.9.0.tgz",
+      "integrity": "sha512-ENVzM5VwV1ojs9jam6vPys97B/S65YQtv/aanqnU7D8aSoHFX8GyhGg0CMfyKNIHBuAVjy3tlzd5QMMINa7wpw==",
       "dev": true,
       "requires": {
         "@xtuc/long": "4.2.2"
       }
     },
     "@webassemblyjs/utf8": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.8.5.tgz",
-      "integrity": "sha512-U7zgftmQriw37tfD934UNInokz6yTmn29inT2cAetAsaU9YeVCveWEwhKL1Mg4yS7q//NGdzy79nlXh3bT8Kjw==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.9.0.tgz",
+      "integrity": "sha512-GZbQlWtopBTP0u7cHrEx+73yZKrQoBMpwkGEIqlacljhXCkVM1kMQge/Mf+csMJAjEdSwhOyLAS0AoR3AG5P8w==",
       "dev": true
     },
     "@webassemblyjs/wasm-edit": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.8.5.tgz",
-      "integrity": "sha512-A41EMy8MWw5yvqj7MQzkDjU29K7UJq1VrX2vWLzfpRHt3ISftOXqrtojn7nlPsZ9Ijhp5NwuODuycSvfAO/26Q==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.9.0.tgz",
+      "integrity": "sha512-FgHzBm80uwz5M8WKnMTn6j/sVbqilPdQXTWraSjBwFXSYGirpkSWE2R9Qvz9tNiTKQvoKILpCuTjBKzOIm0nxw==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/helper-buffer": "1.8.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-        "@webassemblyjs/helper-wasm-section": "1.8.5",
-        "@webassemblyjs/wasm-gen": "1.8.5",
-        "@webassemblyjs/wasm-opt": "1.8.5",
-        "@webassemblyjs/wasm-parser": "1.8.5",
-        "@webassemblyjs/wast-printer": "1.8.5"
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-buffer": "1.9.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
+        "@webassemblyjs/helper-wasm-section": "1.9.0",
+        "@webassemblyjs/wasm-gen": "1.9.0",
+        "@webassemblyjs/wasm-opt": "1.9.0",
+        "@webassemblyjs/wasm-parser": "1.9.0",
+        "@webassemblyjs/wast-printer": "1.9.0"
       }
     },
     "@webassemblyjs/wasm-gen": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.8.5.tgz",
-      "integrity": "sha512-BCZBT0LURC0CXDzj5FXSc2FPTsxwp3nWcqXQdOZE4U7h7i8FqtFK5Egia6f9raQLpEKT1VL7zr4r3+QX6zArWg==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.9.0.tgz",
+      "integrity": "sha512-cPE3o44YzOOHvlsb4+E9qSqjc9Qf9Na1OO/BHFy4OI91XDE14MjFN4lTMezzaIWdPqHnsTodGGNP+iRSYfGkjA==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-        "@webassemblyjs/ieee754": "1.8.5",
-        "@webassemblyjs/leb128": "1.8.5",
-        "@webassemblyjs/utf8": "1.8.5"
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
+        "@webassemblyjs/ieee754": "1.9.0",
+        "@webassemblyjs/leb128": "1.9.0",
+        "@webassemblyjs/utf8": "1.9.0"
       }
     },
     "@webassemblyjs/wasm-opt": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.8.5.tgz",
-      "integrity": "sha512-HKo2mO/Uh9A6ojzu7cjslGaHaUU14LdLbGEKqTR7PBKwT6LdPtLLh9fPY33rmr5wcOMrsWDbbdCHq4hQUdd37Q==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.9.0.tgz",
+      "integrity": "sha512-Qkjgm6Anhm+OMbIL0iokO7meajkzQD71ioelnfPEj6r4eOFuqm4YC3VBPqXjFyyNwowzbMD+hizmprP/Fwkl2A==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/helper-buffer": "1.8.5",
-        "@webassemblyjs/wasm-gen": "1.8.5",
-        "@webassemblyjs/wasm-parser": "1.8.5"
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-buffer": "1.9.0",
+        "@webassemblyjs/wasm-gen": "1.9.0",
+        "@webassemblyjs/wasm-parser": "1.9.0"
       }
     },
     "@webassemblyjs/wasm-parser": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.8.5.tgz",
-      "integrity": "sha512-pi0SYE9T6tfcMkthwcgCpL0cM9nRYr6/6fjgDtL6q/ZqKHdMWvxitRi5JcZ7RI4SNJJYnYNaWy5UUrHQy998lw==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.9.0.tgz",
+      "integrity": "sha512-9+wkMowR2AmdSWQzsPEjFU7njh8HTO5MqO8vjwEHuM+AMHioNqSBONRdr0NQQ3dVQrzp0s8lTcYqzUdb7YgELA==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/helper-api-error": "1.8.5",
-        "@webassemblyjs/helper-wasm-bytecode": "1.8.5",
-        "@webassemblyjs/ieee754": "1.8.5",
-        "@webassemblyjs/leb128": "1.8.5",
-        "@webassemblyjs/utf8": "1.8.5"
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-api-error": "1.9.0",
+        "@webassemblyjs/helper-wasm-bytecode": "1.9.0",
+        "@webassemblyjs/ieee754": "1.9.0",
+        "@webassemblyjs/leb128": "1.9.0",
+        "@webassemblyjs/utf8": "1.9.0"
       }
     },
     "@webassemblyjs/wast-parser": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.8.5.tgz",
-      "integrity": "sha512-daXC1FyKWHF1i11obK086QRlsMsY4+tIOKgBqI1lxAnkp9xe9YMcgOxm9kLe+ttjs5aWV2KKE1TWJCN57/Btsg==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-parser/-/wast-parser-1.9.0.tgz",
+      "integrity": "sha512-qsqSAP3QQ3LyZjNC/0jBJ/ToSxfYJ8kYyuiGvtn/8MK89VrNEfwj7BPQzJVHi0jGTRK2dGdJ5PRqhtjzoww+bw==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/floating-point-hex-parser": "1.8.5",
-        "@webassemblyjs/helper-api-error": "1.8.5",
-        "@webassemblyjs/helper-code-frame": "1.8.5",
-        "@webassemblyjs/helper-fsm": "1.8.5",
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/floating-point-hex-parser": "1.9.0",
+        "@webassemblyjs/helper-api-error": "1.9.0",
+        "@webassemblyjs/helper-code-frame": "1.9.0",
+        "@webassemblyjs/helper-fsm": "1.9.0",
         "@xtuc/long": "4.2.2"
       }
     },
     "@webassemblyjs/wast-printer": {
-      "version": "1.8.5",
-      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.8.5.tgz",
-      "integrity": "sha512-w0U0pD4EhlnvRyeJzBqaVSJAo9w/ce7/WPogeXLzGkO6hzhr4GnQIZ4W4uUt5b9ooAaXPtnXlj0gzsXEOUNYMg==",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.9.0.tgz",
+      "integrity": "sha512-2J0nE95rHXHyQ24cWjMKJ1tqB/ds8z/cyeOZxJhcb+rW+SQASVjuznUSmdz5GpVJTzU8JkhYut0D3siFDD6wsA==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/wast-parser": "1.8.5",
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/wast-parser": "1.9.0",
         "@xtuc/long": "4.2.2"
       }
     },
@@ -1873,15 +1902,16 @@
       }
     },
     "babel-loader": {
-      "version": "8.0.6",
-      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.0.6.tgz",
-      "integrity": "sha512-4BmWKtBOBm13uoUwd08UwjZlaw3O9GWf456R9j+5YykFZ6LUIjIKLc0zEZf+hauxPOJs96C8k6FvYD09vWzhYw==",
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.1.0.tgz",
+      "integrity": "sha512-7q7nC1tYOrqvUrN3LQK4GwSk/TQorZSOlO9C+RZDZpODgyN4ZlCqE5q9cDsyWOliN+aU9B4JX01xK9eJXowJLw==",
       "dev": true,
       "requires": {
-        "find-cache-dir": "^2.0.0",
-        "loader-utils": "^1.0.2",
-        "mkdirp": "^0.5.1",
-        "pify": "^4.0.1"
+        "find-cache-dir": "^2.1.0",
+        "loader-utils": "^1.4.0",
+        "mkdirp": "^0.5.3",
+        "pify": "^4.0.1",
+        "schema-utils": "^2.6.5"
       }
     },
     "babel-plugin-dynamic-import-node": {
@@ -2029,9 +2059,9 @@
       },
       "dependencies": {
         "yargs": {
-          "version": "13.3.0",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz",
-          "integrity": "sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==",
+          "version": "13.3.2",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
+          "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
           "dev": true,
           "requires": {
             "cliui": "^5.0.0",
@@ -2043,7 +2073,7 @@
             "string-width": "^3.0.0",
             "which-module": "^2.0.0",
             "y18n": "^4.0.0",
-            "yargs-parser": "^13.1.1"
+            "yargs-parser": "^13.1.2"
           }
         }
       }
@@ -2083,11 +2113,13 @@
       }
     },
     "bl": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-4.0.1.tgz",
-      "integrity": "sha512-FL/TdvchukRCuWVxT0YMO/7+L5TNeNrVFvRU2IY63aUyv9mpt8splf2NEr6qXtPo5fya5a66YohQKvGNmLrWNA==",
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-4.0.2.tgz",
+      "integrity": "sha512-j4OH8f6Qg2bGuWfRiltT2HYGx0e1QcBTrK9KAHNMwMZdQnDZFk0ZSYIpADjYCB3U12nicC5tVJwSIhwOWjb4RQ==",
       "dev": true,
       "requires": {
+        "buffer": "^5.5.0",
+        "inherits": "^2.0.4",
         "readable-stream": "^3.4.0"
       },
       "dependencies": {
@@ -2143,6 +2175,12 @@
         "type-is": "~1.6.17"
       },
       "dependencies": {
+        "depd": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+          "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
+          "dev": true
+        },
         "http-errors": {
           "version": "1.7.2",
           "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
@@ -2304,14 +2342,15 @@
       }
     },
     "browserslist": {
-      "version": "4.9.1",
-      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.9.1.tgz",
-      "integrity": "sha512-Q0DnKq20End3raFulq6Vfp1ecB9fh8yUNV55s8sekaDDeqBaCtWlRHCUdaWyUeSSBJM7IbM6HcsyaeYqgeDhnw==",
+      "version": "4.11.0",
+      "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.11.0.tgz",
+      "integrity": "sha512-WqEC7Yr5wUH5sg6ruR++v2SGOQYpyUdYYd4tZoAq1F7y+QXoLoYGXVbxhtaIqWmAJjtNTRjVD3HuJc1OXTel2A==",
       "dev": true,
       "requires": {
-        "caniuse-lite": "^1.0.30001030",
-        "electron-to-chromium": "^1.3.363",
-        "node-releases": "^1.1.50"
+        "caniuse-lite": "^1.0.30001035",
+        "electron-to-chromium": "^1.3.380",
+        "node-releases": "^1.1.52",
+        "pkg-up": "^3.1.0"
       }
     },
     "browserstack": {
@@ -2373,9 +2412,9 @@
       "dev": true
     },
     "cacache": {
-      "version": "12.0.3",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.3.tgz",
-      "integrity": "sha512-kqdmfXEGFepesTuROHMs3MpFLWrPkSSpRqOw80RCflZXy/khxaArvFrQ7uJxSUduzAufc6G0g1VUCOZXxWavPw==",
+      "version": "12.0.4",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-12.0.4.tgz",
+      "integrity": "sha512-a0tMB40oefvuInr4Cwb3GerbL9xTj1D5yg0T5xrjGCGyfvbxseIXX7BAO/u/hIXdafzOI5JC3wDwHyf24buOAQ==",
       "dev": true,
       "requires": {
         "bluebird": "^3.5.5",
@@ -2453,9 +2492,9 @@
       }
     },
     "caniuse-lite": {
-      "version": "1.0.30001033",
-      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001033.tgz",
-      "integrity": "sha512-8Ibzxee6ibc5q88cM1usPsMpJOG5CTq0s/dKOmlekPbDGKt+UrnOOTPSjQz3kVo6yL7N4SB5xd+FGLHQmbzh6A==",
+      "version": "1.0.30001038",
+      "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001038.tgz",
+      "integrity": "sha512-zii9quPo96XfOiRD4TrfYGs+QsGZpb2cGiMAzPjtf/hpFgB6zCPZgJb7I1+EATeMw/o+lG8FyRAnI+CWStHcaQ==",
       "dev": true
     },
     "capture-exit": {
@@ -2794,6 +2833,19 @@
         "schema-utils": "^1.0.0",
         "serialize-javascript": "^2.1.2",
         "webpack-log": "^2.0.0"
+      },
+      "dependencies": {
+        "schema-utils": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
+          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+          "dev": true,
+          "requires": {
+            "ajv": "^6.1.0",
+            "ajv-errors": "^1.0.0",
+            "ajv-keywords": "^3.1.0"
+          }
+        }
       }
     },
     "core-js": {
@@ -3112,9 +3164,9 @@
       "dev": true
     },
     "depd": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-      "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
       "dev": true
     },
     "des.js": {
@@ -3236,9 +3288,9 @@
       "dev": true
     },
     "electron-to-chromium": {
-      "version": "1.3.375",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.375.tgz",
-      "integrity": "sha512-zmaFnYVBtfpF8bGRYxgPeVAlXB7N3On8rjBE2ROc6wOpTPpzRWaiHo6KkbJMvlH07CH33uks/TEb6kuMMn8q6A==",
+      "version": "1.3.386",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.386.tgz",
+      "integrity": "sha512-M7JHfp32Bq6Am59AWgglh2d3nqe6y8Y94Vcb/AXUsO3DGvKUHYI5ML9+U5oNShfdOEfurrrjKSoSgFt2mz7mpw==",
       "dev": true
     },
     "elliptic": {
@@ -3330,9 +3382,9 @@
       }
     },
     "es-abstract": {
-      "version": "1.17.4",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.4.tgz",
-      "integrity": "sha512-Ae3um/gb8F0mui/jPL+QiqmglkUsaQf7FwBEHYIFkztkneosu9imhqHpBzQ3h1vit8t5iQ74t6PEVvphBZiuiQ==",
+      "version": "1.17.5",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.17.5.tgz",
+      "integrity": "sha512-BR9auzDbySxOcfog0tLECW8l28eRGpDpU3Dm3Hp4q/N+VtLTmyj4EUN088XZWQDW/hzj6sYRDXeOFsaAODKvpg==",
       "dev": true,
       "requires": {
         "es-to-primitive": "^1.2.1",
@@ -3541,12 +3593,20 @@
       "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A=="
     },
     "esquery": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.1.0.tgz",
-      "integrity": "sha512-MxYW9xKmROWF672KqjO75sszsA8Mxhw06YFeS5VHlB98KDHbOSurm3ArsjO60Eaf3QmGMCP1yn+0JQkNLo/97Q==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.2.0.tgz",
+      "integrity": "sha512-weltsSqdeWIX9G2qQZz7KlTRJdkkOCTPgLYJUz1Hacf48R4YOwGPHO3+ORfWedqJKbq5WQmsgK90n+pFLIKt/Q==",
       "dev": true,
       "requires": {
-        "estraverse": "^4.0.0"
+        "estraverse": "^5.0.0"
+      },
+      "dependencies": {
+        "estraverse": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.0.0.tgz",
+          "integrity": "sha512-j3acdrMzqrxmJTNj5dbr1YbjacrYgAxVMeF0gK16E3j494mOe7xygM/ZLIguEQ0ETwAg2hlJCtHRGav+y0Ny5A==",
+          "dev": true
+        }
       }
     },
     "esrecurse": {
@@ -3701,6 +3761,12 @@
         "vary": "~1.1.2"
       },
       "dependencies": {
+        "depd": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+          "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
+          "dev": true
+        },
         "qs": {
           "version": "6.7.0",
           "resolved": "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz",
@@ -3836,9 +3902,9 @@
       }
     },
     "figgy-pudding": {
-      "version": "3.5.1",
-      "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.1.tgz",
-      "integrity": "sha512-vNKxJHTEKNThjfrdJwHc7brvM6eVevuO5nTj6ez8ZQ1qbXTvGthucRF7S4vf2cr71QVnT70V34v0S1DyQsti0w==",
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/figgy-pudding/-/figgy-pudding-3.5.2.tgz",
+      "integrity": "sha512-0btnI/H8f2pavGMN8w40mlSKOfTK2SVJmBfBeVIj3kNw0swwgzyRq0d5TJVOwodFmtvpPeWPN/MCcfuWF0Ezbw==",
       "dev": true
     },
     "figures": {
@@ -4086,9 +4152,9 @@
       "dev": true
     },
     "fsevents": {
-      "version": "1.2.11",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.11.tgz",
-      "integrity": "sha512-+ux3lx6peh0BpvY0JebGyZoiR4D+oYzdPZMKJwkZ+sFkNJzpL7tXc/wehS49gUAxg3tmMHPHZkA8JU2rhhgDHw==",
+      "version": "1.2.12",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.12.tgz",
+      "integrity": "sha512-Ggd/Ktt7E7I8pxZRbGIs7vwqAPscSESMrCSkx2FtWeqmheJgCo2R74fTsZFCifr0VTPwqRpPv17+6b8Zp7th0Q==",
       "dev": true,
       "optional": true,
       "requires": {
@@ -4139,7 +4205,7 @@
           }
         },
         "chownr": {
-          "version": "1.1.3",
+          "version": "1.1.4",
           "bundled": true,
           "dev": true,
           "optional": true
@@ -4305,7 +4371,7 @@
           }
         },
         "minimist": {
-          "version": "0.0.8",
+          "version": "1.2.5",
           "bundled": true,
           "dev": true
         },
@@ -4328,11 +4394,11 @@
           }
         },
         "mkdirp": {
-          "version": "0.5.1",
+          "version": "0.5.3",
           "bundled": true,
           "dev": true,
           "requires": {
-            "minimist": "0.0.8"
+            "minimist": "^1.2.5"
           }
         },
         "ms": {
@@ -4342,7 +4408,7 @@
           "optional": true
         },
         "needle": {
-          "version": "2.4.0",
+          "version": "2.3.3",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -4371,7 +4437,7 @@
           }
         },
         "nopt": {
-          "version": "4.0.1",
+          "version": "4.0.3",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -4392,17 +4458,17 @@
         "npm-normalize-package-bin": {
           "version": "1.0.1",
           "bundled": true,
-          "dev": true,
-          "optional": true
+          "dev": true
         },
         "npm-packlist": {
-          "version": "1.4.7",
+          "version": "1.4.8",
           "bundled": true,
           "dev": true,
           "optional": true,
           "requires": {
             "ignore-walk": "^3.0.1",
-            "npm-bundled": "^1.0.1"
+            "npm-bundled": "^1.0.1",
+            "npm-normalize-package-bin": "^1.0.1"
           }
         },
         "npmlog": {
@@ -4480,18 +4546,10 @@
             "ini": "~1.3.0",
             "minimist": "^1.2.0",
             "strip-json-comments": "~2.0.1"
-          },
-          "dependencies": {
-            "minimist": {
-              "version": "1.2.0",
-              "bundled": true,
-              "dev": true,
-              "optional": true
-            }
           }
         },
         "readable-stream": {
-          "version": "2.3.6",
+          "version": "2.3.7",
           "bundled": true,
           "dev": true,
           "optional": true,
@@ -4782,9 +4840,9 @@
       "dev": true
     },
     "grunt": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/grunt/-/grunt-1.0.4.tgz",
-      "integrity": "sha512-PYsMOrOC+MsdGEkFVwMaMyc6Ob7pKmq+deg1Sjr+vvMWp35sztfwKE7qoN51V+UEtHsyNuMcGdgMLFkBHvMxHQ==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/grunt/-/grunt-1.1.0.tgz",
+      "integrity": "sha512-+NGod0grmviZ7Nzdi9am7vuRS/h76PcWDsV635mEXF0PEQMUV6Kb+OjTdsVxbi0PZmfQOjCMKb3w8CVZcqsn1g==",
       "dev": true,
       "requires": {
         "coffeescript": "~1.10.0",
@@ -4798,9 +4856,9 @@
         "grunt-legacy-log": "~2.0.0",
         "grunt-legacy-util": "~1.1.1",
         "iconv-lite": "~0.4.13",
-        "js-yaml": "~3.13.0",
+        "js-yaml": "~3.13.1",
         "minimatch": "~3.0.2",
-        "mkdirp": "~0.5.1",
+        "mkdirp": "~1.0.3",
         "nopt": "~3.0.6",
         "path-is-absolute": "~1.0.0",
         "rimraf": "~2.6.2"
@@ -4838,6 +4896,12 @@
             "resolve": "~1.1.0"
           }
         },
+        "mkdirp": {
+          "version": "1.0.3",
+          "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.3.tgz",
+          "integrity": "sha512-6uCP4Qc0sWsgMLy1EOqqS/3rjDHOEnsStVr/4vtAIK2Y5i2kA7lFFejYrpIyiN9w0pYf4ckeCYT9f1r1P9KX5g==",
+          "dev": true
+        },
         "resolve": {
           "version": "1.1.7",
           "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz",
@@ -5145,9 +5209,9 @@
       }
     },
     "html-escaper": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.0.tgz",
-      "integrity": "sha512-a4u9BeERWGu/S8JiWEAQcdrg9v4QArtP9keViQjGMdff20fBdd8waotXaNmODqBe6uZ3Nafi7K/ho4gCQHV3Ig==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.1.tgz",
+      "integrity": "sha512-hNX23TjWwD3q56HpWjUHOKj1+4KKlnjv9PcmBUYKVpga+2cnb9nDx/B1o0yO4n+RZXZdiNxzx6B24C9aNMTkkQ==",
       "dev": true
     },
     "http-errors": {
@@ -5162,6 +5226,12 @@
         "statuses": ">= 1.4.0 < 2"
       },
       "dependencies": {
+        "depd": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+          "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
+          "dev": true
+        },
         "inherits": {
           "version": "2.0.3",
           "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
@@ -5827,9 +5897,9 @@
           }
         },
         "yargs": {
-          "version": "13.3.0",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz",
-          "integrity": "sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==",
+          "version": "13.3.2",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
+          "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
           "dev": true,
           "requires": {
             "cliui": "^5.0.0",
@@ -5841,7 +5911,7 @@
             "string-width": "^3.0.0",
             "which-module": "^2.0.0",
             "y18n": "^4.0.0",
-            "yargs-parser": "^13.1.1"
+            "yargs-parser": "^13.1.2"
           }
         }
       }
@@ -6173,9 +6243,9 @@
           "dev": true
         },
         "yargs": {
-          "version": "13.3.0",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.0.tgz",
-          "integrity": "sha512-2eehun/8ALW8TLoIl7MVaRUrg+yCnenu8B4kBlRxj3GJGDKU1Og7sMXPNm1BYyM1DOJmTZ4YeN/Nwxv+8XJsUA==",
+          "version": "13.3.2",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-13.3.2.tgz",
+          "integrity": "sha512-AX3Zw5iPruN5ie6xGRIDgqkT+ZhnRlZMLMHAs8tg7nRruy2Nb+i5o9bwghAogtM08q1dpr2LVoS8KSTMYpWXUw==",
           "dev": true,
           "requires": {
             "cliui": "^5.0.0",
@@ -6187,7 +6257,7 @@
             "string-width": "^3.0.0",
             "which-module": "^2.0.0",
             "y18n": "^4.0.0",
-            "yargs-parser": "^13.1.1"
+            "yargs-parser": "^13.1.2"
           }
         }
       }
@@ -6432,12 +6502,12 @@
       "dev": true
     },
     "json5": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.1.tgz",
-      "integrity": "sha512-l+3HXD0GEI3huGq1njuqtzYK8OYJyXMkOLtQ53pjWh89tvWS2h6l+1zMkYWqlb57+SiQodKZyvMEFb2X+KrFhQ==",
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.1.2.tgz",
+      "integrity": "sha512-MoUOQ4WdiN3yxhm7NEVJSJrieAo5hNSLQ5sj05OTRHPL9HOBy8u4Bu88jsC1jvqAdN+E1bJmsUcZH+1HQxliqQ==",
       "dev": true,
       "requires": {
-        "minimist": "^1.2.0"
+        "minimist": "^1.2.5"
       }
     },
     "jsonfile": {
@@ -6764,12 +6834,6 @@
         "tmpl": "1.0.x"
       }
     },
-    "mamacro": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/mamacro/-/mamacro-0.0.3.tgz",
-      "integrity": "sha512-qMEwh+UujcQ+kbz3T6V+wAmO2U8veoq2w+3wY8MquqwVA3jChfwY+Tk52GZKDfACEPjuZ7r2oJLejwpt8jtwTA==",
-      "dev": true
-    },
     "map-age-cleaner": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz",
@@ -7026,9 +7090,9 @@
       }
     },
     "minimist": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.3.tgz",
-      "integrity": "sha512-+bMdgqjMN/Z77a6NlY/I3U5LlRDbnmaAk6lDveAPKwSpcPM4tKAuYsvYF8xjhOPXhOYGe/73vVLVez5PW+jqhw==",
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz",
+      "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==",
       "dev": true
     },
     "mississippi": {
@@ -7069,33 +7133,25 @@
       }
     },
     "mkdirp": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz",
-      "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=",
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.4.tgz",
+      "integrity": "sha512-iG9AK/dJLtJ0XNgTuDbSyNS3zECqDlAhnQW4CsNxBG3LQJBbHmRX1egw39DmtOdCAqY+dKXV+sgPgilNWUKMVw==",
       "dev": true,
       "requires": {
-        "minimist": "0.0.8"
-      },
-      "dependencies": {
-        "minimist": {
-          "version": "0.0.8",
-          "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz",
-          "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=",
-          "dev": true
-        }
+        "minimist": "^1.2.5"
       }
     },
     "morgan": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.9.1.tgz",
-      "integrity": "sha512-HQStPIV4y3afTiCYVxirakhlCfGkI161c76kKFca7Fk1JusM//Qeo1ej2XaMniiNeaZklMVrh3vTtIzpzwbpmA==",
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz",
+      "integrity": "sha512-AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ==",
       "dev": true,
       "requires": {
-        "basic-auth": "~2.0.0",
+        "basic-auth": "~2.0.1",
         "debug": "2.6.9",
-        "depd": "~1.1.2",
+        "depd": "~2.0.0",
         "on-finished": "~2.3.0",
-        "on-headers": "~1.0.1"
+        "on-headers": "~1.0.2"
       }
     },
     "move-concurrently": {
@@ -7378,9 +7434,9 @@
       }
     },
     "node-releases": {
-      "version": "1.1.51",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.51.tgz",
-      "integrity": "sha512-1eQEs6HFYY1kMXQPOLzCf7HdjReErmvn85tZESMczdCNVWP3Y7URYLBAyYynuI7yef1zj4HN5q+oB2x67QU0lw==",
+      "version": "1.1.52",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-1.1.52.tgz",
+      "integrity": "sha512-snSiT1UypkgGt2wxPqS6ImEUICbNCMb31yaxWrOLXjhlt2z2/IBpaOxzONExqSm4y5oLnAqjjRWu+wsDzK5yNQ==",
       "dev": true,
       "requires": {
         "semver": "^6.3.0"
@@ -7928,6 +7984,15 @@
         "find-up": "^3.0.0"
       }
     },
+    "pkg-up": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz",
+      "integrity": "sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==",
+      "dev": true,
+      "requires": {
+        "find-up": "^3.0.0"
+      }
+    },
     "pn": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/pn/-/pn-1.1.0.tgz",
@@ -7998,9 +8063,9 @@
       "dev": true
     },
     "prompts": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.3.1.tgz",
-      "integrity": "sha512-qIP2lQyCwYbdzcqHIUi2HAxiWixhoM9OdLCWf8txXsapC/X9YdsCoeyRIXE/GP+Q0J37Q7+XN/MFqbUa7IzXNA==",
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.3.2.tgz",
+      "integrity": "sha512-Q06uKs2CkNYVID0VqwfAl9mipo99zkBv/n2JtWY89Yxa3ZabWSrs0e2KTudKVa3peLUvYXMefDqIleLPVUBZMA==",
       "dev": true,
       "requires": {
         "kleur": "^3.0.3",
@@ -8117,9 +8182,9 @@
       "dev": true
     },
     "psl": {
-      "version": "1.7.0",
-      "resolved": "https://registry.npmjs.org/psl/-/psl-1.7.0.tgz",
-      "integrity": "sha512-5NsSEDv8zY70ScRnOTn7bK7eanl2MvFrOrS/R6x+dBt5g1ghnj9Zv90kO8GwT8gxcu2ANyFprnFYB85IogIJOQ==",
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz",
+      "integrity": "sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==",
       "dev": true
     },
     "public-encrypt": {
@@ -8236,6 +8301,12 @@
         "unpipe": "1.0.0"
       },
       "dependencies": {
+        "depd": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+          "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
+          "dev": true
+        },
         "http-errors": {
           "version": "1.7.2",
           "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz",
@@ -8264,9 +8335,9 @@
       }
     },
     "react-is": {
-      "version": "16.13.0",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.0.tgz",
-      "integrity": "sha512-GFMtL0vHkiBv9HluwNZTggSn/sCyEt9n02aM0dSAjGGyqyNlAyftYm4phPxdvCigG15JreC5biwxCgTAJZ7yAA==",
+      "version": "16.13.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
       "dev": true
     },
     "read-pkg": {
@@ -8390,24 +8461,24 @@
       "dev": true
     },
     "regenerate-unicode-properties": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.1.0.tgz",
-      "integrity": "sha512-LGZzkgtLY79GeXLm8Dp0BVLdQlWICzBnJz/ipWUgo59qBaZ+BHtq51P2q1uVZlppMuUAT37SDk39qUbjTWB7bA==",
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/regenerate-unicode-properties/-/regenerate-unicode-properties-8.2.0.tgz",
+      "integrity": "sha512-F9DjY1vKLo/tPePDycuH3dn9H1OTPIkVD9Kz4LODu+F2C75mgjAJ7x/gwy6ZcSNRAAkhNlJSOHRe8k3p+K9WhA==",
       "dev": true,
       "requires": {
         "regenerate": "^1.4.0"
       }
     },
     "regenerator-runtime": {
-      "version": "0.13.4",
-      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.4.tgz",
-      "integrity": "sha512-plpwicqEzfEyTQohIKktWigcLzmNStMGwbOUbykx51/29Z3JOGYldaaNGK7ngNXV+UcoqvIMmloZ48Sr74sd+g==",
+      "version": "0.13.5",
+      "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz",
+      "integrity": "sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA==",
       "dev": true
     },
     "regenerator-transform": {
-      "version": "0.14.2",
-      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.2.tgz",
-      "integrity": "sha512-V4+lGplCM/ikqi5/mkkpJ06e9Bujq1NFmNLvsCs56zg3ZbzrnUzAtizZ24TXxtRX/W2jcdScwQCnbL0CICTFkQ==",
+      "version": "0.14.4",
+      "resolved": "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.4.tgz",
+      "integrity": "sha512-EaJaKPBI9GvKpvUz2mz4fhx7WPgvwRLY9v3hlNHWmAuJHI13T4nwKnNvm5RWJzEdnI5g5UwtOww+S8IdoUC2bw==",
       "dev": true,
       "requires": {
         "@babel/runtime": "^7.8.4",
@@ -8449,17 +8520,17 @@
       "dev": true
     },
     "regexpu-core": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.6.0.tgz",
-      "integrity": "sha512-YlVaefl8P5BnFYOITTNzDvan1ulLOiXJzCNZxduTIosN17b87h3bvG9yHMoHaRuo88H4mQ06Aodj5VtYGGGiTg==",
+      "version": "4.7.0",
+      "resolved": "https://registry.npmjs.org/regexpu-core/-/regexpu-core-4.7.0.tgz",
+      "integrity": "sha512-TQ4KXRnIn6tz6tjnrXEkD/sshygKH/j5KzK86X8MkeHyZ8qst/LZ89j3X4/8HEIfHANTFIP/AbXakeRhWIl5YQ==",
       "dev": true,
       "requires": {
         "regenerate": "^1.4.0",
-        "regenerate-unicode-properties": "^8.1.0",
-        "regjsgen": "^0.5.0",
-        "regjsparser": "^0.6.0",
+        "regenerate-unicode-properties": "^8.2.0",
+        "regjsgen": "^0.5.1",
+        "regjsparser": "^0.6.4",
         "unicode-match-property-ecmascript": "^1.0.4",
-        "unicode-match-property-value-ecmascript": "^1.1.0"
+        "unicode-match-property-value-ecmascript": "^1.2.0"
       }
     },
     "regjsgen": {
@@ -8735,14 +8806,13 @@
       "integrity": "sha1-XWFr6KXmB9VOEUr65Vt+ry/MMkA="
     },
     "schema-utils": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
-      "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+      "version": "2.6.5",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.6.5.tgz",
+      "integrity": "sha512-5KXuwKziQrTVHh8j/Uxz+QUbxkaLW9X/86NBlx/gnKgtsZA2GIVMUn17qWhRFwF8jdYb3Dig5hRO/W5mZqy6SQ==",
       "dev": true,
       "requires": {
-        "ajv": "^6.1.0",
-        "ajv-errors": "^1.0.0",
-        "ajv-keywords": "^3.1.0"
+        "ajv": "^6.12.0",
+        "ajv-keywords": "^3.4.1"
       }
     },
     "selenium-webdriver": {
@@ -8804,6 +8874,12 @@
         "statuses": "~1.5.0"
       },
       "dependencies": {
+        "depd": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+          "integrity": "sha1-m81S4UwJd2PnSbJ0xDRu0uVgtak=",
+          "dev": true
+        },
         "http-errors": {
           "version": "1.7.3",
           "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz",
@@ -8931,15 +9007,15 @@
       "dev": true
     },
     "signal-exit": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz",
-      "integrity": "sha1-tf3AjxKH6hF4Yo5BXiUTK3NkbG0=",
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.3.tgz",
+      "integrity": "sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==",
       "dev": true
     },
     "sisteransi": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.4.tgz",
-      "integrity": "sha512-/ekMoM4NJ59ivGSfKapeG+FWtrmWvA1p6FBZwXrqojw90vJu8lBmrTxCMuBCydKtkaUe2zt4PlxeTKpjwMbyig==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/sisteransi/-/sisteransi-1.0.5.tgz",
+      "integrity": "sha512-bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg==",
       "dev": true
     },
     "slash": {
@@ -9422,9 +9498,9 @@
       }
     },
     "terser": {
-      "version": "4.6.6",
-      "resolved": "https://registry.npmjs.org/terser/-/terser-4.6.6.tgz",
-      "integrity": "sha512-4lYPyeNmstjIIESr/ysHg2vUPRGf2tzF9z2yYwnowXVuVzLEamPN1Gfrz7f8I9uEPuHcbFlW4PLIAsJoxXyJ1g==",
+      "version": "4.6.7",
+      "resolved": "https://registry.npmjs.org/terser/-/terser-4.6.7.tgz",
+      "integrity": "sha512-fmr7M1f7DBly5cX2+rFDvmGBAaaZyPrHYK4mMdHEDAdNTqXSZgSOfqsfGq2HqPGT/1V0foZZuCZFx8CHKgAk3g==",
       "dev": true,
       "requires": {
         "commander": "^2.20.0",
@@ -9467,6 +9543,17 @@
         "worker-farm": "^1.7.0"
       },
       "dependencies": {
+        "schema-utils": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
+          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+          "dev": true,
+          "requires": {
+            "ajv": "^6.1.0",
+            "ajv-errors": "^1.0.0",
+            "ajv-keywords": "^3.1.0"
+          }
+        },
         "source-map": {
           "version": "0.6.1",
           "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
@@ -9823,15 +9910,15 @@
       }
     },
     "unicode-match-property-value-ecmascript": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.1.0.tgz",
-      "integrity": "sha512-hDTHvaBk3RmFzvSl0UVrUmC3PuW9wKVnpoUDYH0JDkSIovzw+J5viQmeYHxVSBptubnr7PbH2e0fnpDRQnQl5g==",
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/unicode-match-property-value-ecmascript/-/unicode-match-property-value-ecmascript-1.2.0.tgz",
+      "integrity": "sha512-wjuQHGQVofmSJv1uVISKLE5zO2rNGzM/KCYZch/QQvez7C1hUhBIuZ701fYXExuufJFMPhv2SyL8CyoIfMLbIQ==",
       "dev": true
     },
     "unicode-property-aliases-ecmascript": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.0.5.tgz",
-      "integrity": "sha512-L5RAqCfXqAwR3RriF8pM0lU0w4Ryf/GgzONwi6KnL1taJQa7x1TCxdJnILX59WIGOwR57IVxn7Nej0fz1Ny6fw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/unicode-property-aliases-ecmascript/-/unicode-property-aliases-ecmascript-1.1.0.tgz",
+      "integrity": "sha512-PqSoPh/pWetQ2phoj5RLiaqIk4kCNwoV3CI+LfGmWLKI3rE3kl1h59XpX2BjgDrmbxD9ARtQobPGU1SguCYuQg==",
       "dev": true
     },
     "union-value": {
@@ -10061,12 +10148,12 @@
       }
     },
     "watchpack": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.0.tgz",
-      "integrity": "sha512-i6dHe3EyLjMmDlU1/bGQpEw25XSjkJULPuAVKCbNRefQVq48yXKUpwg538F7AZTf9kyr57zj++pQFltUa5H7yA==",
+      "version": "1.6.1",
+      "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-1.6.1.tgz",
+      "integrity": "sha512-+IF9hfUFOrYOOaKyfaI7h7dquUIOgyEMoQMLA7OP5FxegKA2+XdXThAZ9TU2kucfhDH7rfMHs1oPYziVGWRnZA==",
       "dev": true,
       "requires": {
-        "chokidar": "^2.0.2",
+        "chokidar": "^2.1.8",
         "graceful-fs": "^4.1.2",
         "neo-async": "^2.5.0"
       }
@@ -10088,15 +10175,15 @@
       "dev": true
     },
     "webpack": {
-      "version": "4.42.0",
-      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.42.0.tgz",
-      "integrity": "sha512-EzJRHvwQyBiYrYqhyjW9AqM90dE4+s1/XtCfn7uWg6cS72zH+2VPFAlsnW0+W0cDi0XRjNKUMoJtpSi50+Ph6w==",
+      "version": "4.42.1",
+      "resolved": "https://registry.npmjs.org/webpack/-/webpack-4.42.1.tgz",
+      "integrity": "sha512-SGfYMigqEfdGchGhFFJ9KyRpQKnipvEvjc1TwrXEPCM6H5Wywu10ka8o3KGrMzSMxMQKt8aCHUFh5DaQ9UmyRg==",
       "dev": true,
       "requires": {
-        "@webassemblyjs/ast": "1.8.5",
-        "@webassemblyjs/helper-module-context": "1.8.5",
-        "@webassemblyjs/wasm-edit": "1.8.5",
-        "@webassemblyjs/wasm-parser": "1.8.5",
+        "@webassemblyjs/ast": "1.9.0",
+        "@webassemblyjs/helper-module-context": "1.9.0",
+        "@webassemblyjs/wasm-edit": "1.9.0",
+        "@webassemblyjs/wasm-parser": "1.9.0",
         "acorn": "^6.2.1",
         "ajv": "^6.10.2",
         "ajv-keywords": "^3.4.1",
@@ -10108,7 +10195,7 @@
         "loader-utils": "^1.2.3",
         "memory-fs": "^0.4.1",
         "micromatch": "^3.1.10",
-        "mkdirp": "^0.5.1",
+        "mkdirp": "^0.5.3",
         "neo-async": "^2.6.1",
         "node-libs-browser": "^2.2.1",
         "schema-utils": "^1.0.0",
@@ -10127,6 +10214,17 @@
             "esrecurse": "^4.1.0",
             "estraverse": "^4.1.1"
           }
+        },
+        "schema-utils": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-1.0.0.tgz",
+          "integrity": "sha512-i27Mic4KovM/lnGsy8whRCHhc7VicJajAjTrYg11K9zfZXnYIt4k5F+kZkwjnrhKzLic/HLU4j11mjsz2G/75g==",
+          "dev": true,
+          "requires": {
+            "ajv": "^6.1.0",
+            "ajv-errors": "^1.0.0",
+            "ajv-keywords": "^3.1.0"
+          }
         }
       }
     },
@@ -10505,9 +10603,9 @@
       "dev": true
     },
     "yargs": {
-      "version": "15.3.0",
-      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.3.0.tgz",
-      "integrity": "sha512-g/QCnmjgOl1YJjGsnUg2SatC7NUYEiLXJqxNOQU9qSpjzGtGXda9b+OKccr1kLTy8BN9yqEyqfq5lxlwdc13TA==",
+      "version": "15.3.1",
+      "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.3.1.tgz",
+      "integrity": "sha512-92O1HWEjw27sBfgmXiixJWT5hRBp2eobqXicLtPBIDBhYB+1HpwZlXmbW2luivBJHBzki+7VyCLRtAkScbTBQA==",
       "dev": true,
       "requires": {
         "cliui": "^6.0.0",
@@ -10520,7 +10618,7 @@
         "string-width": "^4.2.0",
         "which-module": "^2.0.0",
         "y18n": "^4.0.0",
-        "yargs-parser": "^18.1.0"
+        "yargs-parser": "^18.1.1"
       },
       "dependencies": {
         "ansi-regex": {
@@ -10643,9 +10741,9 @@
           }
         },
         "yargs-parser": {
-          "version": "18.1.0",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.0.tgz",
-          "integrity": "sha512-o/Jr6JBOv6Yx3pL+5naWSoIA2jJ+ZkMYQG/ie9qFbukBe4uzmBatlXFOiu/tNKRWEtyf+n5w7jc/O16ufqOTdQ==",
+          "version": "18.1.2",
+          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.2.tgz",
+          "integrity": "sha512-hlIPNR3IzC1YuL1c2UwwDKpXlNFBqD1Fswwh1khz5+d8Cq/8yc/Mn0i+rQXduu8hcrFKvO7Eryk+09NecTQAAQ==",
           "dev": true,
           "requires": {
             "camelcase": "^5.0.0",
@@ -10655,9 +10753,9 @@
       }
     },
     "yargs-parser": {
-      "version": "13.1.1",
-      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.1.tgz",
-      "integrity": "sha512-oVAVsHz6uFrg3XQheFII8ESO2ssAf9luWuAd6Wexsu4F3OtIW0o8IribPXYrD4WC24LWtPrJlGy87y5udK+dxQ==",
+      "version": "13.1.2",
+      "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-13.1.2.tgz",
+      "integrity": "sha512-3lbsNRf/j+A4QuSZfDRA7HRSfWrzO0YjqTJd5kjAq37Zep1CEgaYmrH9Q3GwPiB9cHyd1Y1UwggGhJGoxipbzg==",
       "dev": true,
       "requires": {
         "camelcase": "^5.0.0",
diff --git a/package.json b/package.json
index 6555ae1..d809807 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fhirpath",
-  "version": "2.0.0",
+  "version": "2.1.0",
   "description": "A FHIRPath engine",
   "main": "src/fhirpath.js",
   "dependencies": {
@@ -19,7 +19,7 @@
     "bestzip": "^2.1.4",
     "copy-webpack-plugin": "^5.1.1",
     "eslint": "^5.2.0",
-    "grunt": "^1.0.4",
+    "grunt": "^1.1.0",
     "grunt-cli": "^1.3.1",
     "grunt-contrib-connect": "^2.0.0",
     "grunt-protractor-runner": "^5.0.0",
diff --git a/src/types.js b/src/types.js
index a10a0eb..4749966 100644
--- a/src/types.js
+++ b/src/types.js
@@ -136,11 +136,11 @@ class FP_Quantity extends FP_Type {
     if ( magnitude1 && magnitude2) {
       return {
         isEqual: numbers.isEqual(this.value*magnitude1, otherQuantity.value*magnitude2)
-      }
+      };
     }
 
     return null;
-  };
+  }
 
 }
 
@@ -167,7 +167,7 @@ FP_Quantity.toUcumQuantity = function (value, unit) {
     return {
       value: magnitude * value,
       unit: 's'
-    }
+    };
   }
 
   return {
@@ -188,7 +188,7 @@ FP_Quantity.convUnitTo = function (fromUnit, value, toUnit) {
   const fromYearMonthMagnitude = FP_Quantity._yearMonthConversionFactor[fromUnit],
     toYearMonthMagnitude = FP_Quantity._yearMonthConversionFactor[toUnit];
   if (fromYearMonthMagnitude && toYearMonthMagnitude) {
-    return new FP_Quantity( fromYearMonthMagnitude*value/toYearMonthMagnitude, toUnit)
+    return new FP_Quantity( fromYearMonthMagnitude*value/toYearMonthMagnitude, toUnit);
   }
 
   const fromMagnitude = FP_Quantity._calendarDuration2Seconds[fromUnit],
@@ -197,7 +197,7 @@ FP_Quantity.convUnitTo = function (fromUnit, value, toUnit) {
   // To FHIR path calendar duration
   if (toMagnitude) {
     if (fromMagnitude) {
-      return new FP_Quantity( fromMagnitude*value/toMagnitude, toUnit)
+      return new FP_Quantity( fromMagnitude*value/toMagnitude, toUnit);
     } else {
       const convResult = ucumUtils.convertUnitTo(fromUnit.replace(/^'|'$/g, ''), value, 's');
 

From 5597fd2065a2558765a8825e1dcb14e3d2fcfb75 Mon Sep 17 00:00:00 2001
From: sedinkinya <yury.sedinkin@nih.gov>
Date: Mon, 30 Mar 2020 09:50:51 -0400
Subject: [PATCH 07/13] Fixes for previous 'Implement toQuantity(unit)'

LF-1351
---
 src/misc.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/misc.js b/src/misc.js
index e73c3c1..7596ebb 100644
--- a/src/misc.js
+++ b/src/misc.js
@@ -47,7 +47,8 @@ engine.toInteger = function(coll){
 
 const quantityRegex = /(?<value>(\+|-)?\d+(\.\d+)?)\s*((?<unit>'[^']+')|(?<time>[a-zA-Z]+))?/;
 engine.toQuantity = function (coll, toUnit) {
-  let result = [];
+  let result;
+
   if (coll.length > 1) {
     throw new Error("Could not convert to quantity: input collection contains multiple items");
   } else if (coll.length === 1) {
@@ -74,7 +75,7 @@ engine.toQuantity = function (coll, toUnit) {
     }
   }
 
-  return result;
+  return result || [];
 };
 
 var numRegex = /^[+-]?\d+(\.\d+)?$/;

From da9fccebe22d9f4298eb6893ec597faadb61314e Mon Sep 17 00:00:00 2001
From: sedinkinya <yury.sedinkin@nih.gov>
Date: Tue, 31 Mar 2020 14:42:37 -0400
Subject: [PATCH 08/13] Implicit conversion to Quantity

LF-1407
---
 src/misc.js              |   7 +-
 src/types.js             |  22 +++++-
 test/cases/fhir-r4.yaml  | 153 +++++++++------------------------------
 test/cases/quantity.yaml | 116 +++++++++++++++++++++++++++++
 4 files changed, 173 insertions(+), 125 deletions(-)
 create mode 100644 test/cases/quantity.yaml

diff --git a/src/misc.js b/src/misc.js
index 7596ebb..0607776 100644
--- a/src/misc.js
+++ b/src/misc.js
@@ -56,12 +56,7 @@ engine.toQuantity = function (coll, toUnit) {
       v = util.valData(item);
     let quantityRegexRes;
 
-    if (item.path === 'Quantity' && v.system === this.vars.ucum) {
-      // The Mapping from FHIR Quantity to FHIRPath System.Quantity is explained here: https://www.hl7.org/fhir/fhirpath.html#quantity
-      if (typeof v.value === 'number' && typeof v.code === 'string') {
-        result = new FP_Quantity(v.value, FP_Quantity.mapUCUMCodeToTimeUnits[v.code] || '\'' + v.code + '\'');
-      }
-    } else if (typeof v === "number") {
+    if (typeof v === "number") {
       result = new FP_Quantity(v, '\'1\'');
     } else if (v instanceof FP_Quantity) {
       result = v;
diff --git a/src/types.js b/src/types.js
index 4749966..3d10451 100644
--- a/src/types.js
+++ b/src/types.js
@@ -2,6 +2,7 @@ const addMinutes = require('date-fns/add_minutes');
 const ucumUtils = require('@lhncbc/ucum-lhc').UcumLhcUtils.getInstance();
 const numbers = require('./numbers');
 
+const ucumSystemUrl = 'http://unitsofmeasure.org';
 let timeFormat =
   '[0-9][0-9](\\:[0-9][0-9](\\:[0-9][0-9](\\.[0-9]+)?)?)?(Z|(\\+|-)[0-9][0-9]\\:[0-9][0-9])?';
 let timeRE = new RegExp('^T?'+timeFormat+'$');
@@ -982,7 +983,7 @@ class ResourceNode {
     if (data.resourceType)
       path = data.resourceType;
     this.path = path;
-    this.data = data;
+    this.data = getResourceNodeData(data, path);
   }
 
   toJSON() {
@@ -990,6 +991,25 @@ class ResourceNode {
   }
 }
 
+/**
+ * Prepare data for ResourceNode:
+ * Converts value from FHIR Quantity to FHIRPath System.Quantity.
+ * The Mapping from FHIR Quantity to FHIRPath System.Quantity is explained here:
+ * https://www.hl7.org/fhir/fhirpath.html#quantity
+ * @param {Object|...} data
+ * @param {string} path
+ * @return {FP_Quantity|Object|...}
+ */
+function getResourceNodeData(data, path) {
+  if (path === 'Quantity' && data.system === ucumSystemUrl) {
+    if (typeof data.value === 'number' && typeof data.code === 'string') {
+      data = new FP_Quantity(data.value, FP_Quantity.mapUCUMCodeToTimeUnits[data.code] || '\'' + data.code + '\'');
+    }
+  }
+
+  return data;
+}
+
 /**
  *  Returns a ResourceNode for the given data node, checking first to see if the
  *  given node is already a ResourceNode.  Takes the same arguments as the
diff --git a/test/cases/fhir-r4.yaml b/test/cases/fhir-r4.yaml
index 6ae1a22..b5d96d0 100644
--- a/test/cases/fhir-r4.yaml
+++ b/test/cases/fhir-r4.yaml
@@ -89,7 +89,6 @@ tests:
       - desc: '** testPolymorphismAsA'
         inputfile: observation-example.json
         expression: Observation.value.as(Quantity).unit
-#        focus: true
         result:
           - lbs
       - desc: '** testPolymorphismAsA'
@@ -501,123 +500,6 @@ tests:
         expression: (1|2).not() = false
         result:
           - true
-  - 'group: testTypes - toQuantity':
-      - desc: '** test'
-        inputfile: patient-example.json
-        expression: 1.toQuantity() = 1 '1'
-        result:
-          - true
-      - desc: '** test'
-        inputfile: patient-example.json
-        expression: 1.0.toQuantity() = 1.0 '1'
-        result:
-          - true
-      - desc: '** test'
-        inputfile: patient-example.json
-        expression: '''1''.toQuantity()'
-        result:
-          - 1 '1'
-      - desc: '** test'
-        inputfile: patient-example.json
-        expression: '''1 day''.toQuantity() = 1 day'
-        result:
-          - true
-      - desc: '** test'
-        inputfile: patient-example.json
-        expression: '''1 day''.toQuantity() = 1 ''d'''
-        result:
-          - true
-      - desc: '** test'
-        inputfile: patient-example.json
-        expression: '''1 \''wk\''''.toQuantity() = 1 week'
-        result:
-          - true
-      - desc: '** test'
-        inputfile: patient-example.json
-        expression: '''1.0''.toQuantity() ~ 1 ''1'''
-        result:
-          - true
-      - desc: '** test'
-        inputfile: patient-example.json
-        expression: '''1 \''wk\''''.toQuantity() = 7 days'
-        result:
-          - true
-      - desc: '** test'
-        inputfile: patient-example.json
-        expression: '''1 \''wk\''''.toQuantity(''days'') = 7 days'
-        result:
-          - true
-      - desc: '** test'
-        inputfile: patient-example.json
-        expression: '''1 \''wk\''''.toQuantity(''\''d\'''') = 7 days'
-        result:
-          - true
-      - desc: '** test'
-        inputfile: patient-example.json
-        expression: '''1 year''.toQuantity() = 1 ''a'''
-        result:
-          - false
-      - desc: '** test'
-        inputfile: patient-example.json
-        expression: '''1 year''.toQuantity() ~ 1 ''a'''
-        result:
-          - true
-      - desc: '** test'
-        inputfile: patient-example.json
-        expression: '''1 cm''.toQuantity(''\''mm\'''').value = 10'
-        result:
-          - true
-      - desc: '** test'
-        inputfile: patient-example.json
-        expression: '''1 cm''.toQuantity(''\''g\'''')'
-        result: []
-      - desc: '** test'
-        inputfile: observation-example.json
-        model: 'r4'
-        expression: Observation.value.toQuantity('kg') ~ 84 'kg'
-        result:
-          - true
-      - desc: '** Converts ''a'' to year on transform FHIR Quantity to System.Quantity'
-        inputfile: quantity-example.json
-        model: 'r4'
-        expression: QuestionnaireResponse.item[0].answer.value.toQuantity() = 2 year
-        result:
-          - true
-      - desc: '** test'
-        inputfile: quantity-example.json
-        model: 'r4'
-        expression: QuestionnaireResponse.item[0].answer.value.toQuantity() ~ 2 'a'
-        result:
-          - true
-      - desc: '** test'
-        inputfile: quantity-example.json
-        model: 'r4'
-        expression: QuestionnaireResponse.item[0].answer.value.toQuantity() != 2 'a'
-        result:
-          - true
-      - desc: '** test'
-        inputfile: quantity-example.json
-        model: 'r4'
-        expression: QuestionnaireResponse.item[1].answer.value.toQuantity() = 3 'min'
-        result:
-          - true
-      - desc: '** Cant convert from FHIR Quantity without context'
-        inputfile: quantity-example.json
-        expression: QuestionnaireResponse.item[1].answer.value.toQuantity()
-        result: []
-      - desc: '** Not UCUM system ignored'
-        inputfile: quantity-example.json
-        model: 'r4'
-        expression: QuestionnaireResponse.item[2].answer.value.toQuantity()
-        result: []
-      - desc: '** test'
-        inputfile: patient-example.json
-        expression: '''1 \''wk\''''.toQuantity(''nonexistent-unit'')'
-        result: []
-      - desc: '** test'
-        inputfile: patient-example.json
-        expression: '''\''wk\''''.toQuantity()'
-        result: []
   - 'group: testTypes':
       - desc: '** test'
         inputfile: patient-example.json
@@ -814,6 +696,41 @@ tests:
         expression: true.isQuantity()
         result:
           - false
+      - desc: '** test'
+        inputfile: patient-example.json
+        expression: 1.toQuantity() = 1 '1'
+        result:
+          - true
+      - desc: '** test'
+        inputfile: patient-example.json
+        expression: 1.0.toQuantity() = 1.0 '1'
+        result:
+          - true
+      - desc: '** test'
+        inputfile: patient-example.json
+        expression: '''1''.toQuantity()'
+        result:
+          - 1 '1'
+      - desc: '** test'
+        inputfile: patient-example.json
+        expression: '''1 day''.toQuantity() = 1 day'
+        result:
+          - true
+      - desc: '** test'
+        inputfile: patient-example.json
+        expression: '''1 day''.toQuantity() = 1 ''d'''
+        result:
+          - true
+      - desc: '** test'
+        inputfile: patient-example.json
+        expression: '''1 \''wk\''''.toQuantity() = 1 week'
+        result:
+          - true
+      - desc: '** test'
+        inputfile: patient-example.json
+        expression: '''1.0''.toQuantity() ~ 1 ''1'''
+        result:
+          - true
       - desc: '** test'
         inputfile: patient-example.json
         expression: 1.isBoolean()
diff --git a/test/cases/quantity.yaml b/test/cases/quantity.yaml
new file mode 100644
index 0000000..5784f0b
--- /dev/null
+++ b/test/cases/quantity.yaml
@@ -0,0 +1,116 @@
+tests:
+  - 'group: standart tests from fhir-r4':
+      - desc: '** test'
+        inputfile: patient-example.json
+        expression: 1.toQuantity() = 1 '1'
+        result:
+          - true
+      - desc: '** test'
+        inputfile: patient-example.json
+        expression: 1.0.toQuantity() = 1.0 '1'
+        result:
+          - true
+      - desc: '** test'
+        inputfile: patient-example.json
+        expression: '''1''.toQuantity()'
+        result:
+          - 1 '1'
+      - desc: '** test'
+        inputfile: patient-example.json
+        expression: '''1 day''.toQuantity() = 1 day'
+        result:
+          - true
+      - desc: '** test'
+        inputfile: patient-example.json
+        expression: '''1 day''.toQuantity() = 1 ''d'''
+        result:
+          - true
+      - desc: '** test'
+        inputfile: patient-example.json
+        expression: '''1 \''wk\''''.toQuantity() = 1 week'
+        result:
+          - true
+      - desc: '** test'
+        inputfile: patient-example.json
+        expression: '''1.0''.toQuantity() ~ 1 ''1'''
+        result:
+          - true
+  - 'group: Additional tests for Quantity':
+    - desc: '** test'
+      inputfile: patient-example.json
+      expression: '''1 \''wk\''''.toQuantity() = 7 days'
+      result:
+        - true
+    - desc: '** test'
+      inputfile: patient-example.json
+      expression: '''1 \''wk\''''.toQuantity(''days'') = 7 days'
+      result:
+        - true
+    - desc: '** test'
+      inputfile: patient-example.json
+      expression: '''1 \''wk\''''.toQuantity(''\''d\'''') = 7 days'
+      result:
+        - true
+    - desc: '** test'
+      inputfile: patient-example.json
+      expression: '''1 year''.toQuantity() = 1 ''a'''
+      result:
+        - false
+    - desc: '** test'
+      inputfile: patient-example.json
+      expression: '''1 year''.toQuantity() ~ 1 ''a'''
+      result:
+        - true
+    - desc: '** test'
+      inputfile: patient-example.json
+      expression: '''1 cm''.toQuantity(''\''mm\'''').value = 10'
+      result:
+        - true
+    - desc: '** test'
+      inputfile: patient-example.json
+      expression: '''1 cm''.toQuantity(''\''g\'''')'
+      result: []
+    - desc: '** test'
+      inputfile: observation-example.json
+      model: 'r4'
+      expression: Observation.value.toQuantity('kg') ~ 84 'kg'
+      result:
+        - true
+    - desc: '** test'
+      inputfile: patient-example.json
+      expression: '''1 \''wk\''''.toQuantity(''nonexistent-unit'')'
+      result: []
+    - desc: '** test'
+      inputfile: patient-example.json
+      expression: '''some not quantity string''.toQuantity()'
+      result: []
+  - 'group: Mapping from FHIR Quantity to FHIRPath System.Quantity':
+      - desc: After converting 'a' to year it is equal to year
+        inputfile: quantity-example.json
+        model: 'r4'
+        expression: QuestionnaireResponse.item[0].answer.value = 2 year
+        result:
+          - true
+      - desc: After converting 'a' to year it is equivalent to 'a'
+        inputfile: quantity-example.json
+        model: 'r4'
+        expression: QuestionnaireResponse.item[0].answer.value ~ 2 'a'
+        result:
+          - true
+      - desc: After converting 'a' to year it isn't equal to 'a'
+        inputfile: quantity-example.json
+        model: 'r4'
+        expression: QuestionnaireResponse.item[0].answer.value != 2 'a'
+        result:
+          - true
+      - desc: After converting 'min' to minute it isn't equal to 'min'
+        inputfile: quantity-example.json
+        model: 'r4'
+        expression: QuestionnaireResponse.item[1].answer.value = 3 'min'
+        result:
+          - true
+      - desc: Unable to convert from non-UCUM system
+        inputfile: quantity-example.json
+        model: 'r4'
+        expression: QuestionnaireResponse.item[2].answer.value.toQuantity()
+        result: []
\ No newline at end of file

From 9c008c9b512a226b90654bb5c1b8503bd8619a87 Mon Sep 17 00:00:00 2001
From: sedinkinya <yury.sedinkin@nih.gov>
Date: Tue, 31 Mar 2020 15:08:45 -0400
Subject: [PATCH 09/13] CHANGELOG.md updated

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e58d6eb..f1b3c82 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ This log documents significant changes for each release.  This project follows
 ### Added
 - Function toQuantity(unit)
 - Operators =(equality) and ~(equivalence) for Quantity
+- Implicit conversion from FHIR Quantity to FHIRPath System.Quantity
 
 ## [2.0.0] - 2020-03-11
 ### Changed

From 3d02751c928b5d55ba766bf775c785eb751fecc1 Mon Sep 17 00:00:00 2001
From: sedinkinya <yury.sedinkin@nih.gov>
Date: Wed, 1 Apr 2020 11:45:34 -0400
Subject: [PATCH 10/13] Constructs mapTimeUnitsToUCUMCode from
 mapUCUMCodeToTimeUnits

LF-1407
---
 src/types.js | 25 ++++++-------------------
 1 file changed, 6 insertions(+), 19 deletions(-)

diff --git a/src/types.js b/src/types.js
index 3d10451..11b89b1 100644
--- a/src/types.js
+++ b/src/types.js
@@ -294,25 +294,12 @@ FP_Quantity.mapUCUMCodeToTimeUnits = {
 /**
  *  Defines a map from FHIRPath time units to UCUM code.
  */
-FP_Quantity.mapTimeUnitsToUCUMCode = {
-  'years': "a",
-  'months': "mo",
-  'weeks': "wk",
-  'days': "d",
-  'hours': "h",
-  'minutes': "min",
-  'seconds': "s",
-  'milliseconds': "ms",
-  'year': "a",
-  'month': "mo",
-  'week': "wk",
-  'day': "d",
-  'hour': "h",
-  'minute': "min",
-  'second': "s",
-  'millisecond': "ms"
-};
-
+FP_Quantity.mapTimeUnitsToUCUMCode = Object.keys(FP_Quantity.mapUCUMCodeToTimeUnits)
+  .reduce(function (res, key) {
+    res[FP_Quantity.mapUCUMCodeToTimeUnits[key]] = key;
+    res[FP_Quantity.mapUCUMCodeToTimeUnits[key]+'s'] = key;
+    return res;
+  }, {});
 
 /**
  *  A map of the UCUM units that must be paired with integer values when doing

From 049c797545aea9044a62da381e27c45abe5969ed Mon Sep 17 00:00:00 2001
From: sedinkinya <yury.sedinkin@nih.gov>
Date: Thu, 2 Apr 2020 12:47:53 -0400
Subject: [PATCH 11/13] Unnecessary code removed

LF-1407
---
 src/misc.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/misc.js b/src/misc.js
index 0607776..32b5552 100644
--- a/src/misc.js
+++ b/src/misc.js
@@ -66,7 +66,7 @@ engine.toQuantity = function (coll, toUnit) {
     }
 
     if (result && toUnit && result.unit !== toUnit) {
-      result = FP_Quantity.convUnitTo(result.unit, result.value, toUnit) || [];
+      result = FP_Quantity.convUnitTo(result.unit, result.value, toUnit);
     }
   }
 

From a9f1e68da7c1d25dd57290744c50221549093474 Mon Sep 17 00:00:00 2001
From: sedinkinya <yury.sedinkin@nih.gov>
Date: Fri, 3 Apr 2020 12:31:16 -0400
Subject: [PATCH 12/13] Test fixes

LF-1407
---
 test/cases/5.5_conversion.yaml                | 49 +++++++++++++++++
 .../{quantity.yaml => fhir-quantity.yaml}     | 52 +------------------
 2 files changed, 51 insertions(+), 50 deletions(-)
 rename test/cases/{quantity.yaml => fhir-quantity.yaml} (58%)

diff --git a/test/cases/5.5_conversion.yaml b/test/cases/5.5_conversion.yaml
index 748e930..80aa509 100644
--- a/test/cases/5.5_conversion.yaml
+++ b/test/cases/5.5_conversion.yaml
@@ -126,6 +126,55 @@ tests:
     result: ['101.99']
 
 
+  - desc: '5.5.7. toQuantity([unit:string]) : Quantity'
+  - desc: '** string to Quantity'
+    inputfile: patient-example.json
+    expression: '''1 \''wk\''''.toQuantity() = 7 days'
+    result:
+      - true
+  - desc: '** string to Quantity'
+    inputfile: patient-example.json
+    expression: '''1 \''wk\''''.toQuantity(''days'') = 7 days'
+    result:
+      - true
+  - desc: '** string to Quantity'
+    inputfile: patient-example.json
+    expression: '''1 \''wk\''''.toQuantity(''\''d\'''') = 7 days'
+    result:
+      - true
+  - desc: '** calendar duration conversion factor'
+    inputfile: patient-example.json
+    expression: '''1 year''.toQuantity() != 1 ''a'''
+    result:
+      - true
+  - desc: '** calendar duration conversion factor'
+    inputfile: patient-example.json
+    expression: '''1 year''.toQuantity() ~ 1 ''a'''
+    result:
+      - true
+  - desc: '** UCUM units'
+    inputfile: patient-example.json
+    expression: '''1 cm''.toQuantity(''\''mm\'''').value = 10'
+    result:
+      - true
+  - desc: '** Invalid conversion'
+    inputfile: patient-example.json
+    expression: '''1 cm''.toQuantity(''\''g\'''')'
+    result: []
+  - desc: '** Implicit to quantity + toQuantity'
+    inputfile: observation-example.json
+    model: 'r4'
+    expression: Observation.value.toQuantity('kg') ~ 84 'kg'
+    result:
+      - true
+  - desc: '** Invalid conversion'
+    inputfile: patient-example.json
+    expression: '''1 \''wk\''''.toQuantity(''nonexistent-unit'')'
+    result: []
+  - desc: '** Invalid conversion'
+    inputfile: patient-example.json
+    expression: '''some not quantity string''.toQuantity()'
+    result: []
 
 subject:
   resourceType: Functions
diff --git a/test/cases/quantity.yaml b/test/cases/fhir-quantity.yaml
similarity index 58%
rename from test/cases/quantity.yaml
rename to test/cases/fhir-quantity.yaml
index 5784f0b..9ee64f3 100644
--- a/test/cases/quantity.yaml
+++ b/test/cases/fhir-quantity.yaml
@@ -1,5 +1,5 @@
 tests:
-  - 'group: standart tests from fhir-r4':
+  - 'group: standard tests from fhir-r4':
       - desc: '** test'
         inputfile: patient-example.json
         expression: 1.toQuantity() = 1 '1'
@@ -35,55 +35,7 @@ tests:
         expression: '''1.0''.toQuantity() ~ 1 ''1'''
         result:
           - true
-  - 'group: Additional tests for Quantity':
-    - desc: '** test'
-      inputfile: patient-example.json
-      expression: '''1 \''wk\''''.toQuantity() = 7 days'
-      result:
-        - true
-    - desc: '** test'
-      inputfile: patient-example.json
-      expression: '''1 \''wk\''''.toQuantity(''days'') = 7 days'
-      result:
-        - true
-    - desc: '** test'
-      inputfile: patient-example.json
-      expression: '''1 \''wk\''''.toQuantity(''\''d\'''') = 7 days'
-      result:
-        - true
-    - desc: '** test'
-      inputfile: patient-example.json
-      expression: '''1 year''.toQuantity() = 1 ''a'''
-      result:
-        - false
-    - desc: '** test'
-      inputfile: patient-example.json
-      expression: '''1 year''.toQuantity() ~ 1 ''a'''
-      result:
-        - true
-    - desc: '** test'
-      inputfile: patient-example.json
-      expression: '''1 cm''.toQuantity(''\''mm\'''').value = 10'
-      result:
-        - true
-    - desc: '** test'
-      inputfile: patient-example.json
-      expression: '''1 cm''.toQuantity(''\''g\'''')'
-      result: []
-    - desc: '** test'
-      inputfile: observation-example.json
-      model: 'r4'
-      expression: Observation.value.toQuantity('kg') ~ 84 'kg'
-      result:
-        - true
-    - desc: '** test'
-      inputfile: patient-example.json
-      expression: '''1 \''wk\''''.toQuantity(''nonexistent-unit'')'
-      result: []
-    - desc: '** test'
-      inputfile: patient-example.json
-      expression: '''some not quantity string''.toQuantity()'
-      result: []
+  # see Use of FHIR Quantity: https://www.hl7.org/fhir/fhirpath.html#quantity
   - 'group: Mapping from FHIR Quantity to FHIRPath System.Quantity':
       - desc: After converting 'a' to year it is equal to year
         inputfile: quantity-example.json

From 18511d78791d90b355b6908f68f4e33d815fe14c Mon Sep 17 00:00:00 2001
From: sedinkinya <yury.sedinkin@nih.gov>
Date: Fri, 3 Apr 2020 12:39:15 -0400
Subject: [PATCH 13/13] Test fixes

LF-1407
---
 test/cases/fhir-quantity.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/cases/fhir-quantity.yaml b/test/cases/fhir-quantity.yaml
index 9ee64f3..2dfd1cc 100644
--- a/test/cases/fhir-quantity.yaml
+++ b/test/cases/fhir-quantity.yaml
@@ -55,7 +55,7 @@ tests:
         expression: QuestionnaireResponse.item[0].answer.value != 2 'a'
         result:
           - true
-      - desc: After converting 'min' to minute it isn't equal to 'min'
+      - desc: After converting 'min' to minute it is equal to 'min'
         inputfile: quantity-example.json
         model: 'r4'
         expression: QuestionnaireResponse.item[1].answer.value = 3 'min'