@nmshd/transport 1.1.5 → 1.1.9

package/lib-web/nmshd.transport.js

@@ -15,11 +15,11 @@ exports.buildInformation = void 0;
 const ts_serval_1 = __webpack_require__(/*! @js-soft/ts-serval */ "@js-soft/ts-serval");
 const crypto_1 = __webpack_require__(/*! @nmshd/crypto */ "@nmshd/crypto");
 exports.buildInformation = {
-    version: "1.1.5",
-    build: "17",
-    date: "2022-01-03T13:16:27+00:00",
-    commit: "84aa2cdf19c200c50a429b31d5e4b83a658f5820",
-    dependencies: {"@js-soft/docdb-access-abstractions":"1.0.1","@js-soft/logging-abstractions":"1.0.0","@js-soft/simple-logger":"1.0.0","@js-soft/ts-utils":"1.1.1","axios":"^0.24.0","deep-equal":"^2.0.5","fast-json-patch":"^3.1.0","form-data":"^4.0.0","json-stringify-safe":"^5.0.1","lodash":"^4.17.21","luxon":"^2.2.0","qs":"^6.10.2","reflect-metadata":"^0.1.13","ts-simple-nameof":"^1.3.1","uuid":"^8.3.2"},
+    version: "1.1.9",
+    build: "21",
+    date: "2022-02-04T12:41:52+00:00",
+    commit: "a3d954a1746fd2cf627ecc834de1bafe59b7db8d",
+    dependencies: {"@js-soft/docdb-access-abstractions":"1.0.1","@js-soft/logging-abstractions":"1.0.0","@js-soft/simple-logger":"1.0.1","@js-soft/ts-utils":"1.1.1","axios":"^0.25.0","deep-equal":"^2.0.5","fast-json-patch":"^3.1.0","form-data":"^4.0.0","json-stringify-safe":"^5.0.1","lodash":"^4.17.21","luxon":"^2.3.0","qs":"^6.10.3","reflect-metadata":"^0.1.13","ts-simple-nameof":"^1.3.1","uuid":"^8.3.2"},
     libraries: {
         crypto: crypto_1.buildInformation,
         serval: ts_serval_1.buildInformation
@@ -5252,29 +5252,12 @@ class FileController extends TransportController_1.TransportController {
         if (ids.length < 1) {
             return [];
         }
+        // TODO: JSSNMSHDD-2820 (check for items that couldn't be fetched e.g. because it is expired)
+        const resultItems = (await this.client.getFiles({ ids })).value;
         const promises = [];
-        for (const id of ids) {
-            const result = await this.client.getFile(id);
-            if (result.isError) {
-                if (result.error.code === "error.transport.recordNotFound" ||
-                    result.error.code === "error.transport.request.notFound" ||
-                    result.error.code === "error.platform.recordNotFound") {
-                    this.log.warn(`Record id ${id} could not be found on backbone. It might be expired.`, result.error);
-                    continue;
-                }
-                throw result.error;
-            }
-            const resultItem = result.value;
-            promises.push(this.updateCacheOfExistingFileInDb(resultItem.id, resultItem));
-        }
-        /*
-        // TODO: Optimize once backbone handling is clarified
-        const resultItems = (await this.client.getFiles({ ids })).value
-        const promises = []
         for await (const resultItem of resultItems) {
-            promises.push(this.updateCacheOfExistingFileInDb(resultItem.id, resultItem))
+            promises.push(this.updateCacheOfExistingFileInDb(resultItem.id, resultItem));
         }
-        */
         return await Promise.all(promises);
     }
     async updateCacheOfExistingFileInDb(id, response) {
@@ -7160,29 +7143,12 @@ class RelationshipTemplateController extends TransportController_1.TransportCont
         if (ids.length < 1) {
             return [];
         }
+        // TODO: JSSNMSHDD-2820 (check for items that couldn't be fetched e.g. because it is expired)
+        const resultItems = (await this.client.getRelationshipTemplates({ ids })).value;
         const promises = [];
-        for (const id of ids) {
-            const result = await this.client.getRelationshipTemplate(id);
-            if (result.isError) {
-                if (result.error.code === "error.transport.recordNotFound" ||
-                    result.error.code === "error.transport.request.notFound" ||
-                    result.error.code === "error.platform.recordNotFound") {
-                    this.log.warn(`Record id ${id} could not be found on backbone. It might be expired.`, result.error);
-                    continue;
-                }
-                throw result.error;
-            }
-            const resultItem = result.value;
-            promises.push(this.updateCacheOfExistingTemplateInDb(resultItem.id, resultItem));
-        }
-        /*
-        // TODO: Optimize once backbone handling is clarified
-        const resultItems = (await this.client.getRelationshipTemplates({ ids })).value
-        const promises = []
         for await (const resultItem of resultItems) {
-            promises.push(this.updateCacheOfExistingTemplateInDb(resultItem.id, resultItem))
+            promises.push(this.updateCacheOfExistingTemplateInDb(resultItem.id, resultItem));
         }
-        */
         return await Promise.all(promises);
     }
     async fetchCaches(ids) {
@@ -11067,30 +11033,14 @@ class TokenController extends TransportController_1.TransportController {
         if (ids.length < 1) {
             return [];
         }
+        // TODO: JSSNMSHDD-2820 (check for items that couldn't be fetched e.g. because it is expired)
+        const resultItems = (await this.client.getTokens({ ids })).value;
         const promises = [];
-        for (const id of ids) {
-            const result = await this.client.getToken(id);
-            if (result.isError) {
-                if (result.error.code === "error.transport.recordNotFound" ||
-                    result.error.code === "error.transport.request.notFound" ||
-                    result.error.code === "error.platform.recordNotFound") {
-                    this.log.warn(`Record id ${id} could not be found on backbone. It might be expired.`, result.error);
-                    continue;
-                }
-                throw result.error;
-            }
-            const resultItem = result.value;
-            promises.push(this.updateCacheOfExistingTokenInDb(resultItem.id, resultItem));
-        }
-        /*
-        // TODO: Optimize once backbone handling is clarified
-        const resultItems = (await this.client.getTokens({ ids })).value
-        const promises = []
         for await (const resultItem of resultItems) {
-            promises.push(this.updateCacheOfExistingTokenInDb(resultItem.id, resultItem))
+            promises.push(this.updateCacheOfExistingTokenInDb(resultItem.id, resultItem));
         }
-        */
-        return await Promise.all(promises);
+        const isToken = (item) => !!item;
+        return (await Promise.all(promises)).filter(isToken);
     }
     async fetchCaches(ids) {
         if (ids.length === 0)
@@ -11106,7 +11056,8 @@ class TokenController extends TransportController_1.TransportController {
     async updateCacheOfExistingTokenInDb(id, response) {
         const tokenDoc = await this.tokens.read(id);
         if (!tokenDoc) {
-            throw core_1.TransportErrors.general.recordNotFound(Token_1.Token, id).logWith(this._log);
+            core_1.TransportErrors.general.recordNotFound(Token_1.Token, id).logWith(this._log);
+            return;
         }
         const token = await Token_1.Token.from(tokenDoc);
         await this.updateCacheOfToken(token, response);
@@ -11149,7 +11100,16 @@ class TokenController extends TransportController_1.TransportController {
     async loadPeerToken(id, secretKey, ephemeral) {
         const tokenDoc = await this.tokens.read(id.toString());
         if (tokenDoc) {
-            return await this.updateCacheOfExistingTokenInDb(id.toString());
+            let token = await Token_1.Token.from(tokenDoc);
+            if (token.cache) {
+                return token;
+            }
+            token = await this.updateCacheOfExistingTokenInDb(id.toString());
+            if (!token) {
+                // This should not happen, we only update the cache if we found the tokenDoc
+                throw new Error(`Tried to update a token (with ID: '${id.toString()}') that doesn't exist in the local database.`);
+            }
+            return token;
         }
         const token = await Token_1.Token.from({
             id: id,
@@ -12081,7 +12041,7 @@ class SimpleLogger {
             if (arg instanceof Error) {
                 return (_a = arg.stack) !== null && _a !== void 0 ? _a : `${arg.name}: ${arg.message}`;
             }
-            return json_stringify_safe_1.default(arg);
+            return (0, json_stringify_safe_1.default)(arg);
         })
             .join("\n");
         return { msg: message };
@@ -13141,14 +13101,18 @@ function Axios(instanceConfig) {
  *
  * @param {Object} config The config specific for this request (merged with this.defaults)
  */
-Axios.prototype.request = function request(config) {
+Axios.prototype.request = function request(configOrUrl, config) {
   /*eslint no-param-reassign:0*/
   // Allow for axios('example/url'[, config]) a la fetch API
-  if (typeof config === 'string') {
-    config = arguments[1] || {};
-    config.url = arguments[0];
-  } else {
+  if (typeof configOrUrl === 'string') {
     config = config || {};
+    config.url = configOrUrl;
+  } else {
+    config = configOrUrl || {};
+  }
+
+  if (!config.url) {
+    throw new Error('Provided config url is not valid');
   }
 
   config = mergeConfig(this.defaults, config);
@@ -13233,6 +13197,9 @@ Axios.prototype.request = function request(config) {
 };
 
 Axios.prototype.getUri = function getUri(config) {
+  if (!config.url) {
+    throw new Error('Provided config url is not valid');
+  }
   config = mergeConfig(this.defaults, config);
   return buildURL(config.url, config.params, config.paramsSerializer).replace(/^\?/, '');
 };
@@ -13873,7 +13840,7 @@ module.exports = defaults;
 /***/ ((module) => {
 
 module.exports = {
-  "version": "0.24.0"
+  "version": "0.25.0"
 };
 
 /***/ }),
@@ -14089,7 +14056,7 @@ module.exports = function isAbsoluteURL(url) {
   // A URL is considered absolute if it begins with "<scheme>://" or "//" (protocol-relative URL).
   // RFC 3986 defines scheme name as a sequence of characters beginning with a letter and followed
   // by any combination of letters, digits, plus, period, or hyphen.
-  return /^([a-z][a-z\d\+\-\.]*:)?\/\//i.test(url);
+  return /^([a-z][a-z\d+\-.]*:)?\/\//i.test(url);
 };
 
 
@@ -14099,11 +14066,13 @@ module.exports = function isAbsoluteURL(url) {
 /*!********************************************************!*\
   !*** ./node_modules/axios/lib/helpers/isAxiosError.js ***!
   \********************************************************/
-/***/ ((module) => {
+/***/ ((module, __unused_webpack_exports, __webpack_require__) => {
 
 "use strict";
 
 
+var utils = __webpack_require__(/*! ./../utils */ "./node_modules/axios/lib/utils.js");
+
 /**
  * Determines whether the payload is an error thrown by Axios
  *
@@ -14111,7 +14080,7 @@ module.exports = function isAbsoluteURL(url) {
  * @returns {boolean} True if the payload is an error thrown by Axios, otherwise false
  */
 module.exports = function isAxiosError(payload) {
-  return (typeof payload === 'object') && (payload.isAxiosError === true);
+  return utils.isObject(payload) && (payload.isAxiosError === true);
 };
 
 
@@ -14436,7 +14405,7 @@ var toString = Object.prototype.toString;
  * @returns {boolean} True if value is an Array, otherwise false
  */
 function isArray(val) {
-  return toString.call(val) === '[object Array]';
+  return Array.isArray(val);
 }
 
 /**
@@ -14477,7 +14446,7 @@ function isArrayBuffer(val) {
  * @returns {boolean} True if value is an FormData, otherwise false
  */
 function isFormData(val) {
-  return (typeof FormData !== 'undefined') && (val instanceof FormData);
+  return toString.call(val) === '[object FormData]';
 }
 
 /**
@@ -14491,7 +14460,7 @@ function isArrayBufferView(val) {
   if ((typeof ArrayBuffer !== 'undefined') && (ArrayBuffer.isView)) {
     result = ArrayBuffer.isView(val);
   } else {
-    result = (val) && (val.buffer) && (val.buffer instanceof ArrayBuffer);
+    result = (val) && (val.buffer) && (isArrayBuffer(val.buffer));
   }
   return result;
 }
@@ -14598,7 +14567,7 @@ function isStream(val) {
  * @returns {boolean} True if value is a URLSearchParams object, otherwise false
  */
 function isURLSearchParams(val) {
-  return typeof URLSearchParams !== 'undefined' && val instanceof URLSearchParams;
+  return toString.call(val) === '[object URLSearchParams]';
 }
 
 /**
@@ -35011,17 +34980,16 @@ function padStart(input, n) {
     n = 2;
   }
 
-  var minus = input < 0 ? "-" : "";
-  var target = minus ? input * -1 : input;
-  var result;
+  var isNeg = input < 0;
+  var padded;
 
-  if (target.toString().length < n) {
-    result = ("0".repeat(n) + target).slice(-n);
+  if (isNeg) {
+    padded = "-" + ("" + -input).padStart(n, "0");
   } else {
-    result = target.toString();
+    padded = ("" + input).padStart(n, "0");
   }
 
-  return "" + minus + result;
+  return padded;
 }
 function parseInteger(string) {
   if (isUndefined(string) || string === null || string === "") {
@@ -36643,7 +36611,27 @@ var Settings = /*#__PURE__*/function () {
   return Settings;
 }();
 
-var _excluded = ["base"];
+var _excluded = ["base"],
+    _excluded2 = ["padTo", "floor"];
+
+var intlLFCache = {};
+
+function getCachedLF(locString, opts) {
+  if (opts === void 0) {
+    opts = {};
+  }
+
+  var key = JSON.stringify([locString, opts]);
+  var dtf = intlLFCache[key];
+
+  if (!dtf) {
+    dtf = new Intl.ListFormat(locString, opts);
+    intlLFCache[key] = dtf;
+  }
+
+  return dtf;
+}
+
 var intlDTCache = {};
 
 function getCachedDTF(locString, opts) {
@@ -36812,10 +36800,15 @@ var PolyNumberFormatter = /*#__PURE__*/function () {
     this.padTo = opts.padTo || 0;
     this.floor = opts.floor || false;
 
-    if (!forceSimple) {
-      var intlOpts = {
+    opts.padTo;
+        opts.floor;
+        var otherOpts = _objectWithoutPropertiesLoose(opts, _excluded2);
+
+    if (!forceSimple || Object.keys(otherOpts).length > 0) {
+      var intlOpts = _extends({
         useGrouping: false
-      };
+      }, opts);
+
       if (opts.padTo > 0) intlOpts.minimumIntegerDigits = opts.padTo;
       this.inf = getCachedINF(intl, intlOpts);
     }
@@ -37009,8 +37002,7 @@ var Locale = /*#__PURE__*/function () {
 
   var _proto4 = Locale.prototype;
 
-  _proto4.listingMode = function listingMode(defaultOK) {
-
+  _proto4.listingMode = function listingMode() {
     var isActuallyEn = this.isEnglish();
     var hasNoWeirdness = (this.numberingSystem === null || this.numberingSystem === "latn") && (this.outputCalendar === null || this.outputCalendar === "gregory");
     return isActuallyEn && hasNoWeirdness ? "en" : "intl";
@@ -37190,6 +37182,14 @@ var Locale = /*#__PURE__*/function () {
     return new PolyRelFormatter(this.intl, this.isEnglish(), opts);
   };
 
+  _proto4.listFormatter = function listFormatter(opts) {
+    if (opts === void 0) {
+      opts = {};
+    }
+
+    return getCachedLF(this.intl, opts);
+  };
+
   _proto4.isEnglish = function isEnglish() {
     return this.locale === "en" || this.locale.toLowerCase() === "en-us" || new Intl.DateTimeFormat(this.intl).resolvedOptions().locale.startsWith("en-us");
   };
@@ -37935,6 +37935,48 @@ var Duration = /*#__PURE__*/function () {
 
     return this.isValid ? Formatter.create(this.loc, fmtOpts).formatDurationFromString(this, fmt) : INVALID$2;
   }
+  /**
+   * Returns a string representation of a Duration with all units included
+   * To modify its behavior use the `listStyle` and any Intl.NumberFormat option, though `unitDisplay` is especially relevant. See {@link Intl.NumberFormat}.
+   * @param opts - On option object to override the formatting. Accepts the same keys as the options parameter of the native `Int.NumberFormat` constructor, as well as `listStyle`.
+   * @example
+   * ```js
+   * var dur = Duration.fromObject({ days: 1, hours: 5, minutes: 6 })
+   * dur.toHuman() //=> '1 day, 5 hours, 6 minutes'
+   * dur.toHuman({ listStyle: "long" }) //=> '1 day, 5 hours, and 6 minutes'
+   * dur.toHuman({ unitDisplay: "short" }) //=> '1 day, 5 hr, 6 min'
+   * ```
+   */
+  ;
+
+  _proto.toHuman = function toHuman(opts) {
+    var _this = this;
+
+    if (opts === void 0) {
+      opts = {};
+    }
+
+    var l = orderedUnits$1.map(function (unit) {
+      var val = _this.values[unit];
+
+      if (isUndefined(val)) {
+        return null;
+      }
+
+      return _this.loc.numberFormatter(_extends({
+        style: "unit",
+        unitDisplay: "long"
+      }, opts, {
+        unit: unit.slice(0, -1)
+      })).format(val);
+    }).filter(function (n) {
+      return n;
+    });
+    return this.loc.listFormatter(_extends({
+      type: "conjunction",
+      style: opts.listStyle || "narrow"
+    }, opts)).format(l);
+  }
   /**
    * Returns a JavaScript object with this Duration's values.
    * @example Duration.fromObject({ years: 1, days: 6, seconds: 2 }).toObject() //=> { years: 1, days: 6, seconds: 2 }
@@ -40472,51 +40514,67 @@ function toTechFormat(dt, format, allowZ) {
     allowZ: allowZ,
     forceSimple: true
   }).formatDateTimeFromString(dt, format) : null;
-} // technical time formats (e.g. the time part of ISO 8601), take some options
-// and this commonizes their handling
+}
+
+function _toISODate(o, extended) {
+  var longFormat = o.c.year > 9999 || o.c.year < 0;
+  var c = "";
+  if (longFormat && o.c.year >= 0) c += "+";
+  c += padStart(o.c.year, longFormat ? 6 : 4);
+
+  if (extended) {
+    c += "-";
+    c += padStart(o.c.month);
+    c += "-";
+    c += padStart(o.c.day);
+  } else {
+    c += padStart(o.c.month);
+    c += padStart(o.c.day);
+  }
 
+  return c;
+}
 
-function toTechTimeFormat(dt, _ref) {
-  var _ref$suppressSeconds = _ref.suppressSeconds,
-      suppressSeconds = _ref$suppressSeconds === void 0 ? false : _ref$suppressSeconds,
-      _ref$suppressMillisec = _ref.suppressMilliseconds,
-      suppressMilliseconds = _ref$suppressMillisec === void 0 ? false : _ref$suppressMillisec,
-      includeOffset = _ref.includeOffset,
-      _ref$includePrefix = _ref.includePrefix,
-      includePrefix = _ref$includePrefix === void 0 ? false : _ref$includePrefix,
-      _ref$includeZone = _ref.includeZone,
-      includeZone = _ref$includeZone === void 0 ? false : _ref$includeZone,
-      _ref$spaceZone = _ref.spaceZone,
-      spaceZone = _ref$spaceZone === void 0 ? false : _ref$spaceZone,
-      _ref$format = _ref.format,
-      format = _ref$format === void 0 ? "extended" : _ref$format;
-  var fmt = format === "basic" ? "HHmm" : "HH:mm";
+function _toISOTime(o, extended, suppressSeconds, suppressMilliseconds, includeOffset) {
+  var c = padStart(o.c.hour);
 
-  if (!suppressSeconds || dt.second !== 0 || dt.millisecond !== 0) {
-    fmt += format === "basic" ? "ss" : ":ss";
+  if (extended) {
+    c += ":";
+    c += padStart(o.c.minute);
 
-    if (!suppressMilliseconds || dt.millisecond !== 0) {
-      fmt += ".SSS";
+    if (o.c.second !== 0 || !suppressSeconds) {
+      c += ":";
     }
+  } else {
+    c += padStart(o.c.minute);
   }
 
-  if ((includeZone || includeOffset) && spaceZone) {
-    fmt += " ";
-  }
+  if (o.c.second !== 0 || !suppressSeconds) {
+    c += padStart(o.c.second);
 
-  if (includeZone) {
-    fmt += "z";
-  } else if (includeOffset) {
-    fmt += format === "basic" ? "ZZZ" : "ZZ";
+    if (o.c.millisecond !== 0 || !suppressMilliseconds) {
+      c += ".";
+      c += padStart(o.c.millisecond, 3);
+    }
   }
 
-  var str = toTechFormat(dt, fmt);
-
-  if (includePrefix) {
-    str = "T" + str;
+  if (includeOffset) {
+    if (o.isOffsetFixed && o.offset === 0) {
+      c += "Z";
+    } else if (o.o < 0) {
+      c += "-";
+      c += padStart(Math.trunc(-o.o / 60));
+      c += ":";
+      c += padStart(Math.trunc(-o.o % 60));
+    } else {
+      c += "+";
+      c += padStart(Math.trunc(o.o / 60));
+      c += ":";
+      c += padStart(Math.trunc(o.o % 60));
+    }
   }
 
-  return str;
+  return c;
 } // defaults for unspecified units in the supported calendars
 
 
@@ -40711,9 +40769,9 @@ var DateTime = /*#__PURE__*/function () {
       var unchanged = config.old && config.old.ts === this.ts && config.old.zone.equals(zone);
 
       if (unchanged) {
-        var _ref2 = [config.old.c, config.old.o];
-        c = _ref2[0];
-        o = _ref2[1];
+        var _ref = [config.old.c, config.old.o];
+        c = _ref[0];
+        o = _ref[1];
       } else {
         var ot = zone.offset(this.ts);
         c = tsToObj(this.ts, ot);
@@ -41383,11 +41441,11 @@ var DateTime = /*#__PURE__*/function () {
   ;
 
   _proto.setZone = function setZone(zone, _temp) {
-    var _ref3 = _temp === void 0 ? {} : _temp,
-        _ref3$keepLocalTime = _ref3.keepLocalTime,
-        keepLocalTime = _ref3$keepLocalTime === void 0 ? false : _ref3$keepLocalTime,
-        _ref3$keepCalendarTim = _ref3.keepCalendarTime,
-        keepCalendarTime = _ref3$keepCalendarTim === void 0 ? false : _ref3$keepCalendarTim;
+    var _ref2 = _temp === void 0 ? {} : _temp,
+        _ref2$keepLocalTime = _ref2.keepLocalTime,
+        keepLocalTime = _ref2$keepLocalTime === void 0 ? false : _ref2$keepLocalTime,
+        _ref2$keepCalendarTim = _ref2.keepCalendarTime,
+        keepCalendarTime = _ref2$keepCalendarTim === void 0 ? false : _ref2$keepCalendarTim;
 
     zone = normalizeZone(zone, Settings.defaultZone);
 
@@ -41422,10 +41480,10 @@ var DateTime = /*#__PURE__*/function () {
   ;
 
   _proto.reconfigure = function reconfigure(_temp2) {
-    var _ref4 = _temp2 === void 0 ? {} : _temp2,
-        locale = _ref4.locale,
-        numberingSystem = _ref4.numberingSystem,
-        outputCalendar = _ref4.outputCalendar;
+    var _ref3 = _temp2 === void 0 ? {} : _temp2,
+        locale = _ref3.locale,
+        numberingSystem = _ref3.numberingSystem,
+        outputCalendar = _ref3.outputCalendar;
 
     var loc = this.loc.clone({
       locale: locale,
@@ -41528,7 +41586,7 @@ var DateTime = /*#__PURE__*/function () {
    * See {@link DateTime#plus}
    * @param {Duration|Object|number} duration - The amount to subtract. Either a Luxon Duration, a number of milliseconds, the object argument to Duration.fromObject()
    @return {DateTime}
-  */
+   */
   ;
 
   _proto.minus = function minus(duration) {
@@ -41693,7 +41751,7 @@ var DateTime = /*#__PURE__*/function () {
    * @param {boolean} [opts.suppressSeconds=false] - exclude seconds from the format if they're 0
    * @param {boolean} [opts.includeOffset=true] - include the offset, such as 'Z' or '-04:00'
    * @param {string} [opts.format='extended'] - choose between the basic and extended format
-   * @example DateTime.utc(1982, 5, 25).toISO() //=> '1982-05-25T00:00:00.000Z'
+   * @example DateTime.utc(1983, 5, 25).toISO() //=> '1982-05-25T00:00:00.000Z'
    * @example DateTime.now().toISO() //=> '2017-04-22T20:47:05.335-04:00'
    * @example DateTime.now().toISO({ includeOffset: false }) //=> '2017-04-22T20:47:05.335'
    * @example DateTime.now().toISO({ format: 'basic' }) //=> '20170422T204705.335-0400'
@@ -41701,16 +41759,28 @@ var DateTime = /*#__PURE__*/function () {
    */
   ;
 
-  _proto.toISO = function toISO(opts) {
-    if (opts === void 0) {
-      opts = {};
-    }
+  _proto.toISO = function toISO(_temp3) {
+    var _ref4 = _temp3 === void 0 ? {} : _temp3,
+        _ref4$format = _ref4.format,
+        format = _ref4$format === void 0 ? "extended" : _ref4$format,
+        _ref4$suppressSeconds = _ref4.suppressSeconds,
+        suppressSeconds = _ref4$suppressSeconds === void 0 ? false : _ref4$suppressSeconds,
+        _ref4$suppressMillise = _ref4.suppressMilliseconds,
+        suppressMilliseconds = _ref4$suppressMillise === void 0 ? false : _ref4$suppressMillise,
+        _ref4$includeOffset = _ref4.includeOffset,
+        includeOffset = _ref4$includeOffset === void 0 ? true : _ref4$includeOffset;
 
     if (!this.isValid) {
       return null;
     }
 
-    return this.toISODate(opts) + "T" + this.toISOTime(opts);
+    var ext = format === "extended";
+
+    var c = _toISODate(this, ext);
+
+    c += "T";
+    c += _toISOTime(this, ext, suppressSeconds, suppressMilliseconds, includeOffset);
+    return c;
   }
   /**
    * Returns an ISO 8601-compliant string representation of this DateTime's date component
@@ -41722,18 +41792,16 @@ var DateTime = /*#__PURE__*/function () {
    */
   ;
 
-  _proto.toISODate = function toISODate(_temp3) {
-    var _ref5 = _temp3 === void 0 ? {} : _temp3,
+  _proto.toISODate = function toISODate(_temp4) {
+    var _ref5 = _temp4 === void 0 ? {} : _temp4,
         _ref5$format = _ref5.format,
         format = _ref5$format === void 0 ? "extended" : _ref5$format;
 
-    var fmt = format === "basic" ? "yyyyMMdd" : "yyyy-MM-dd";
-
-    if (this.year > 9999) {
-      fmt = "+" + fmt;
+    if (!this.isValid) {
+      return null;
     }
 
-    return toTechFormat(this, fmt);
+    return _toISODate(this, format === "extended");
   }
   /**
    * Returns an ISO 8601-compliant string representation of this DateTime's week date
@@ -41761,8 +41829,8 @@ var DateTime = /*#__PURE__*/function () {
    */
   ;
 
-  _proto.toISOTime = function toISOTime(_temp4) {
-    var _ref6 = _temp4 === void 0 ? {} : _temp4,
+  _proto.toISOTime = function toISOTime(_temp5) {
+    var _ref6 = _temp5 === void 0 ? {} : _temp5,
         _ref6$suppressMillise = _ref6.suppressMilliseconds,
         suppressMilliseconds = _ref6$suppressMillise === void 0 ? false : _ref6$suppressMillise,
         _ref6$suppressSeconds = _ref6.suppressSeconds,
@@ -41774,16 +41842,15 @@ var DateTime = /*#__PURE__*/function () {
         _ref6$format = _ref6.format,
         format = _ref6$format === void 0 ? "extended" : _ref6$format;
 
-    return toTechTimeFormat(this, {
-      suppressSeconds: suppressSeconds,
-      suppressMilliseconds: suppressMilliseconds,
-      includeOffset: includeOffset,
-      includePrefix: includePrefix,
-      format: format
-    });
+    if (!this.isValid) {
+      return null;
+    }
+
+    var c = includePrefix ? "T" : "";
+    return c + _toISOTime(this, format === "extended", suppressSeconds, suppressMilliseconds, includeOffset);
   }
   /**
-   * Returns an RFC 2822-compatible string representation of this DateTime, always in UTC
+   * Returns an RFC 2822-compatible string representation of this DateTime
    * @example DateTime.utc(2014, 7, 13).toRFC2822() //=> 'Sun, 13 Jul 2014 00:00:00 +0000'
    * @example DateTime.local(2014, 7, 13).toRFC2822() //=> 'Sun, 13 Jul 2014 00:00:00 -0400'
    * @return {string}
@@ -41794,7 +41861,7 @@ var DateTime = /*#__PURE__*/function () {
     return toTechFormat(this, "EEE, dd LLL yyyy HH:mm:ss ZZZ", false);
   }
   /**
-   * Returns a string representation of this DateTime appropriate for use in HTTP headers.
+   * Returns a string representation of this DateTime appropriate for use in HTTP headers. The output is always expressed in GMT.
    * Specifically, the string conforms to RFC 1123.
    * @see https://www.w3.org/Protocols/rfc2616/rfc2616-sec3.html#sec3.3.1
    * @example DateTime.utc(2014, 7, 13).toHTTP() //=> 'Sun, 13 Jul 2014 00:00:00 GMT'
@@ -41814,7 +41881,11 @@ var DateTime = /*#__PURE__*/function () {
   ;
 
   _proto.toSQLDate = function toSQLDate() {
-    return toTechFormat(this, "yyyy-MM-dd");
+    if (!this.isValid) {
+      return null;
+    }
+
+    return _toISODate(this, true);
   }
   /**
    * Returns a string representation of this DateTime appropriate for use in SQL Time
@@ -41829,18 +41900,26 @@ var DateTime = /*#__PURE__*/function () {
    */
   ;
 
-  _proto.toSQLTime = function toSQLTime(_temp5) {
-    var _ref7 = _temp5 === void 0 ? {} : _temp5,
+  _proto.toSQLTime = function toSQLTime(_temp6) {
+    var _ref7 = _temp6 === void 0 ? {} : _temp6,
         _ref7$includeOffset = _ref7.includeOffset,
         includeOffset = _ref7$includeOffset === void 0 ? true : _ref7$includeOffset,
         _ref7$includeZone = _ref7.includeZone,
         includeZone = _ref7$includeZone === void 0 ? false : _ref7$includeZone;
 
-    return toTechTimeFormat(this, {
-      includeOffset: includeOffset,
-      includeZone: includeZone,
-      spaceZone: true
-    });
+    var fmt = "HH:mm:ss.SSS";
+
+    if (includeZone || includeOffset) {
+      fmt += " ";
+
+      if (includeZone) {
+        fmt += "z";
+      } else if (includeOffset) {
+        fmt += "ZZ";
+      }
+    }
+
+    return toTechFormat(this, fmt, true);
   }
   /**
    * Returns a string representation of this DateTime appropriate for use in SQL DateTime
@@ -42044,10 +42123,10 @@ var DateTime = /*#__PURE__*/function () {
   _proto.hasSame = function hasSame(otherDateTime, unit) {
     if (!this.isValid) return false;
     var inputMs = otherDateTime.valueOf();
-    var otherZoneDateTime = this.setZone(otherDateTime.zone, {
+    var adjustedToZone = this.setZone(otherDateTime.zone, {
       keepLocalTime: true
     });
-    return otherZoneDateTime.startOf(unit) <= inputMs && inputMs <= otherZoneDateTime.endOf(unit);
+    return adjustedToZone.startOf(unit) <= inputMs && inputMs <= adjustedToZone.endOf(unit);
   }
   /**
    * Equality check
@@ -42846,7 +42925,7 @@ function friendlyDateTime(dateTimeish) {
   }
 }
 
-var VERSION = "2.2.0";
+var VERSION = "2.3.0";
 
 exports.DateTime = DateTime;
 exports.Duration = Duration;
@@ -43543,7 +43622,7 @@ var parseObject = function (chain, val, options, valuesParsed) {
             ) {
                 obj = [];
                 obj[index] = leaf;
-            } else {
+            } else if (cleanRoot !== '__proto__') {
                 obj[cleanRoot] = leaf;
             }
         }
@@ -43761,7 +43840,7 @@ var stringify = function stringify(
     var tmpSc = sideChannel;
     var step = 0;
     var findFlag = false;
-    while ((tmpSc = tmpSc.get(sentinel)) !== undefined && !findFlag) {
+    while ((tmpSc = tmpSc.get(sentinel)) !== void undefined && !findFlag) {
         // Where object last appeared in the ref tree
         var pos = tmpSc.get(object);
         step += 1;
@@ -43823,7 +43902,7 @@ var stringify = function stringify(
     var objKeys;
     if (generateArrayPrefix === 'comma' && isArray(obj)) {
         // we need to join elements in
-        objKeys = [{ value: obj.length > 0 ? obj.join(',') || null : undefined }];
+        objKeys = [{ value: obj.length > 0 ? obj.join(',') || null : void undefined }];
     } else if (isArray(filter)) {
         objKeys = filter;
     } else {
@@ -43833,7 +43912,7 @@ var stringify = function stringify(
 
     for (var j = 0; j < objKeys.length; ++j) {
         var key = objKeys[j];
-        var value = typeof key === 'object' && key.value !== undefined ? key.value : obj[key];
+        var value = typeof key === 'object' && typeof key.value !== 'undefined' ? key.value : obj[key];
 
         if (skipNulls && value === null) {
             continue;
@@ -43873,7 +43952,7 @@ var normalizeStringifyOptions = function normalizeStringifyOptions(opts) {
         return defaults;
     }
 
-    if (opts.encoder !== null && opts.encoder !== undefined && typeof opts.encoder !== 'function') {
+    if (opts.encoder !== null && typeof opts.encoder !== 'undefined' && typeof opts.encoder !== 'function') {
         throw new TypeError('Encoder has to be a function.');
     }