@nmshd/runtime 1.2.7 → 1.2.11

package/lib-web/nmshd.runtime.js

@@ -327,11 +327,11 @@ const content_1 = __webpack_require__(/*! @nmshd/content */ "@nmshd/content");
 const crypto_1 = __webpack_require__(/*! @nmshd/crypto */ "@nmshd/crypto");
 const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
 exports.buildInformation = {
-    version: "1.2.7",
-    build: "22",
-    date: "2021-12-28T17:46:08+00:00",
-    commit: "d41ef8c47ab5e5633fb077cac667f1a77ee17fdc",
-    dependencies: {"@js-soft/docdb-querytranslator":"1.0.1","@js-soft/logging-abstractions":"1.0.0","@js-soft/ts-serval":"1.0.2","@js-soft/ts-utils":"^1.1.1","@nmshd/consumption":"1.0.10","@nmshd/content":"1.1.2","@nmshd/crypto":"1.0.6","@nmshd/transport":"1.1.3","ajv":"^8.8.2","ajv-errors":"^3.0.0","ajv-formats":"^2.1.1","fluent-ts-validator":"3.0.2","luxon":"^2.2.0","qrcode":"1.5.0","reflect-metadata":"0.1.13","ts-simple-nameof":"1.3.1","typescript-ioc":"3.2.2"},
+    version: "1.2.11",
+    build: "26",
+    date: "2022-01-04T10:02:05+00:00",
+    commit: "983cadd9b210c4fc12b1184cfa7b316e767c8d37",
+    dependencies: {"@js-soft/docdb-querytranslator":"1.0.1","@js-soft/logging-abstractions":"1.0.0","@js-soft/ts-serval":"1.0.2","@js-soft/ts-utils":"^1.1.1","@nmshd/consumption":"1.0.11","@nmshd/content":"1.1.2","@nmshd/crypto":"1.0.6","@nmshd/transport":"1.1.5","ajv":"^8.8.2","ajv-errors":"^3.0.0","ajv-formats":"^2.1.1","fluent-ts-validator":"3.0.2","json-stringify-safe":"^5.0.1","luxon":"^2.3.0","qrcode":"1.5.0","reflect-metadata":"0.1.13","ts-simple-nameof":"1.3.1","typescript-ioc":"3.2.2"},
     libraries: {
         serval: ts_serval_1.buildInformation,
         consumption: consumption_1.buildInformation,
@@ -3746,6 +3746,9 @@ Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.RuntimeErrors = void 0;
 const ts_utils_1 = __webpack_require__(/*! @js-soft/ts-utils */ "./node_modules/@js-soft/ts-utils/dist/index.js");
 class General {
+    unknown(message, data) {
+        return new ts_utils_1.ApplicationError("error.runtime.unknown", message, data);
+    }
     alreadyInitialized() {
         return new ts_utils_1.ApplicationError("error.runtime.alreadyInitialized", "The runtime is already initialized. The init method can only be executed once.");
     }
@@ -5921,15 +5924,19 @@ exports.LoadPeerTokenRequest = {
 /*!*****************************************!*\
   !*** ./dist/useCases/common/UseCase.js ***!
   \*****************************************/
-/***/ ((__unused_webpack_module, exports, __webpack_require__) => {
+/***/ (function(__unused_webpack_module, exports, __webpack_require__) {
 
 "use strict";
 
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", ({ value: true }));
 exports.UseCase = void 0;
 const ts_serval_1 = __webpack_require__(/*! @js-soft/ts-serval */ "@js-soft/ts-serval");
 const ts_utils_1 = __webpack_require__(/*! @js-soft/ts-utils */ "./node_modules/@js-soft/ts-utils/dist/index.js");
 const transport_1 = __webpack_require__(/*! @nmshd/transport */ "@nmshd/transport");
+const json_stringify_safe_1 = __importDefault(__webpack_require__(/*! json-stringify-safe */ "./node_modules/json-stringify-safe/stringify.js"));
 const PlatformErrorCodes_1 = __webpack_require__(/*! ./PlatformErrorCodes */ "./dist/useCases/common/PlatformErrorCodes.js");
 const RuntimeErrors_1 = __webpack_require__(/*! ./RuntimeErrors */ "./dist/useCases/common/RuntimeErrors.js");
 class UseCase {
@@ -5947,20 +5954,23 @@ class UseCase {
             return await this.executeInternal(request);
         }
         catch (e) {
-            if (!(e instanceof Error)) {
-                throw e;
-            }
-            return this.resultFromError(e);
+            return this.failingResultFromUnknownError(e);
         }
     }
-    resultFromError(error) {
+    failingResultFromUnknownError(error) {
+        if (!(error instanceof Error)) {
+            return ts_utils_1.Result.fail(RuntimeErrors_1.RuntimeErrors.general.unknown(`An unknown object was thrown in a UseCase: ${(0, json_stringify_safe_1.default)(error)}`, error));
+        }
         if (error instanceof transport_1.RequestError) {
             return this.handleRequestError(error);
         }
         if (error instanceof ts_serval_1.ServalError) {
             return this.handleServalError(error);
         }
-        throw error;
+        if (error instanceof ts_utils_1.ApplicationError) {
+            return ts_utils_1.Result.fail(error);
+        }
+        return ts_utils_1.Result.fail(RuntimeErrors_1.RuntimeErrors.general.unknown(`An error was thrown in a UseCase: ${error.message}`, error));
     }
     handleServalError(error) {
         let runtimeError;
@@ -5986,7 +5996,7 @@ class UseCase {
         if (PlatformErrorCodes_1.PlatformErrorCodes.isUnexpectedError(error)) {
             return ts_utils_1.Result.fail(new ts_utils_1.ApplicationError(error.code, error.message));
         }
-        throw error;
+        return ts_utils_1.Result.fail(error);
     }
     validationFailed(validationResult) {
         var _a, _b, _c;
@@ -24927,6 +24937,43 @@ function escapeJsonPtr(str) {
 }
 
 
+/***/ }),
+
+/***/ "./node_modules/json-stringify-safe/stringify.js":
+/*!*******************************************************!*\
+  !*** ./node_modules/json-stringify-safe/stringify.js ***!
+  \*******************************************************/
+/***/ ((module, exports) => {
+
+exports = module.exports = stringify
+exports.getSerialize = serializer
+
+function stringify(obj, replacer, spaces, cycleReplacer) {
+  return JSON.stringify(obj, serializer(replacer, cycleReplacer), spaces)
+}
+
+function serializer(replacer, cycleReplacer) {
+  var stack = [], keys = []
+
+  if (cycleReplacer == null) cycleReplacer = function(key, value) {
+    if (stack[0] === value) return "[Circular ~]"
+    return "[Circular ~." + keys.slice(0, stack.indexOf(value)).join(".") + "]"
+  }
+
+  return function(key, value) {
+    if (stack.length > 0) {
+      var thisPos = stack.indexOf(this)
+      ~thisPos ? stack.splice(thisPos + 1) : stack.push(this)
+      ~thisPos ? keys.splice(thisPos, Infinity, key) : keys.push(key)
+      if (~stack.indexOf(value)) value = cycleReplacer.call(this, key, value)
+    }
+    else stack.push(value)
+
+    return replacer == null ? value : replacer.call(this, key, value)
+  }
+}
+
+
 /***/ }),
 
 /***/ "./node_modules/lodash.get/index.js":
@@ -27391,17 +27438,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 === "") {
@@ -29023,7 +29069,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) {
@@ -29192,10 +29258,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);
     }
@@ -29389,8 +29460,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";
@@ -29570,6 +29640,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");
   };
@@ -30315,6 +30393,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 }
@@ -32852,51 +32972,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
 
 
@@ -33091,9 +33227,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);
@@ -33763,11 +33899,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);
 
@@ -33802,10 +33938,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,
@@ -33908,7 +34044,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) {
@@ -34073,7 +34209,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'
@@ -34081,16 +34217,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
@@ -34102,18 +34250,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
@@ -34141,8 +34287,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,
@@ -34154,16 +34300,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}
@@ -34174,7 +34319,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'
@@ -34194,7 +34339,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
@@ -34209,18 +34358,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
@@ -34424,10 +34581,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
@@ -35226,7 +35383,7 @@ function friendlyDateTime(dateTimeish) {
   }
 }
 
-var VERSION = "2.2.0";
+var VERSION = "2.3.0";
 
 exports.DateTime = DateTime;
 exports.Duration = Duration;