@medplum/agent 2.2.5 → 2.2.7

package/dist/cjs/index.cjs

@@ -4470,23 +4470,23 @@ var require_AsyncEventEmitter = __commonJS({
       return self2;
     };
     AsyncEventEmitter.prototype.once = function(type, listener) {
-      var self2 = this, g3;
+      var self2 = this, g2;
       if (typeof listener !== "function") {
         throw new TypeError("listener must be a function");
       }
       if (listener.length >= 2) {
-        g3 = function(e, next) {
-          self2.removeListener(type, g3);
+        g2 = function(e, next) {
+          self2.removeListener(type, g2);
           listener(e, next);
         };
       } else {
-        g3 = function(e) {
-          self2.removeListener(type, g3);
+        g2 = function(e) {
+          self2.removeListener(type, g2);
           listener(e);
         };
       }
-      g3.listener = listener;
-      self2.on(type, g3);
+      g2.listener = listener;
+      self2.on(type, g2);
       return self2;
     };
     AsyncEventEmitter.prototype.first = function(event, listener) {
@@ -5116,11 +5116,11 @@ var require_dcmjs = __commonJS({
         throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
       }
       function _createForOfIteratorHelper(o, allowArrayLike) {
-        var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"];
-        if (!it) {
-          if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") {
-            if (it)
-              o = it;
+        var it2 = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"];
+        if (!it2) {
+          if (Array.isArray(o) || (it2 = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") {
+            if (it2)
+              o = it2;
             var i2 = 0;
             var F = function() {
             };
@@ -5147,10 +5147,10 @@ var require_dcmjs = __commonJS({
         var normalCompletion = true, didErr = false, err2;
         return {
           s: function() {
-            it = it.call(o);
+            it2 = it2.call(o);
           },
           n: function() {
-            var step = it.next();
+            var step = it2.next();
             normalCompletion = step.done;
             return step;
           },
@@ -5160,8 +5160,8 @@ var require_dcmjs = __commonJS({
           },
           f: function() {
             try {
-              if (!normalCompletion && it.return != null)
-                it.return();
+              if (!normalCompletion && it2.return != null)
+                it2.return();
             } finally {
               if (didErr)
                 throw err2;
@@ -6994,8 +6994,8 @@ var require_dcmjs = __commonJS({
         STR_APPLY_UIA_OK = false;
       }
       const _utf8len = new Uint8Array(256);
-      for (let q2 = 0; q2 < 256; q2++) {
-        _utf8len[q2] = q2 >= 252 ? 6 : q2 >= 248 ? 5 : q2 >= 240 ? 4 : q2 >= 224 ? 3 : q2 >= 192 ? 2 : 1;
+      for (let q = 0; q < 256; q++) {
+        _utf8len[q] = q >= 252 ? 6 : q >= 248 ? 5 : q >= 240 ? 4 : q >= 224 ? 3 : q >= 192 ? 2 : 1;
       }
       _utf8len[254] = _utf8len[254] = 1;
       var string2buf = (str2) => {
@@ -7870,8 +7870,8 @@ var require_dcmjs = __commonJS({
       const ENOUGH_DISTS = 592;
       const MAX_WBITS = 15;
       const DEF_WBITS = MAX_WBITS;
-      const zswap32 = (q2) => {
-        return (q2 >>> 24 & 255) + (q2 >>> 8 & 65280) + ((q2 & 65280) << 8) + ((q2 & 255) << 24);
+      const zswap32 = (q) => {
+        return (q >>> 24 & 255) + (q >>> 8 & 65280) + ((q & 65280) << 8) + ((q & 255) << 24);
       };
       function InflateState() {
         this.mode = 0;
@@ -9455,9 +9455,9 @@ var require_dcmjs = __commonJS({
         }, {
           key: "readVR",
           value: function readVR() {
-            var vr2 = String.fromCharCode(this.view.getUint8(this.offset)) + String.fromCharCode(this.view.getUint8(this.offset + 1));
+            var vr = String.fromCharCode(this.view.getUint8(this.offset)) + String.fromCharCode(this.view.getUint8(this.offset + 1));
             this.increment(2);
-            return vr2;
+            return vr;
           }
         }, {
           key: "readEncodedString",
@@ -9779,7 +9779,7 @@ var require_dcmjs = __commonJS({
           }
         }, {
           key: "is",
-          value: function is(t) {
+          value: function is2(t) {
             return this.value == t;
           }
         }, {
@@ -9807,7 +9807,7 @@ var require_dcmjs = __commonJS({
         }, {
           key: "write",
           value: function write(stream, vrType, values, syntax, writeOptions) {
-            var vr2 = ValueRepresentation.createByTypeString(vrType), useSyntax = DicomMessage._normalizeSyntax(syntax);
+            var vr = ValueRepresentation.createByTypeString(vrType), useSyntax = DicomMessage._normalizeSyntax(syntax);
             var implicit = useSyntax == IMPLICIT_LITTLE_ENDIAN ? true : false, isLittleEndian = useSyntax == IMPLICIT_LITTLE_ENDIAN || useSyntax == EXPLICIT_LITTLE_ENDIAN$1 ? true : false, isEncapsulated = this.isPixelDataTag() && DicomMessage.isEncapsulated(syntax);
             var oldEndian = stream.isLittleEndian;
             stream.setEndian(isLittleEndian);
@@ -9816,11 +9816,11 @@ var require_dcmjs = __commonJS({
             var tagStream = new WriteBufferStream(256), valueLength;
             tagStream.setEndian(isLittleEndian);
             if (vrType == "OW" || vrType == "OB" || vrType == "UN") {
-              valueLength = vr2.writeBytes(tagStream, values, useSyntax, isEncapsulated, writeOptions);
+              valueLength = vr.writeBytes(tagStream, values, useSyntax, isEncapsulated, writeOptions);
             } else if (vrType == "SQ") {
-              valueLength = vr2.writeBytes(tagStream, values, useSyntax, writeOptions);
+              valueLength = vr.writeBytes(tagStream, values, useSyntax, writeOptions);
             } else {
-              valueLength = vr2.writeBytes(tagStream, values, writeOptions);
+              valueLength = vr.writeBytes(tagStream, values, writeOptions);
             }
             if (vrType == "SQ") {
               valueLength = 4294967295;
@@ -9830,13 +9830,13 @@ var require_dcmjs = __commonJS({
               stream.writeUint32(valueLength);
               written += 4;
             } else {
-              if (vr2.isExplicit()) {
-                stream.writeAsciiString(vr2.type);
+              if (vr.isExplicit()) {
+                stream.writeAsciiString(vr.type);
                 stream.writeUint16(0);
                 stream.writeUint32(valueLength);
                 written += 8;
               } else {
-                stream.writeAsciiString(vr2.type);
+                stream.writeAsciiString(vr.type);
                 stream.writeUint16(valueLength);
                 written += 4;
               }
@@ -10141,20 +10141,20 @@ var require_dcmjs = __commonJS({
         }, {
           key: "createByTypeString",
           value: function createByTypeString(type) {
-            var vr2 = VRinstances[type];
-            if (vr2 === void 0) {
+            var vr = VRinstances[type];
+            if (vr === void 0) {
               if (type == "ox") {
                 validationLog.error("Invalid vr type", type, "- using OW");
-                vr2 = VRinstances["OW"];
+                vr = VRinstances["OW"];
               } else if (type == "xs") {
                 validationLog.error("Invalid vr type", type, "- using US");
-                vr2 = VRinstances["US"];
+                vr = VRinstances["US"];
               } else {
                 validationLog.error("Invalid vr type", type, "- using UN");
-                vr2 = VRinstances["UN"];
+                vr = VRinstances["UN"];
               }
             }
-            return vr2;
+            return vr;
           }
         }]);
         return ValueRepresentation2;
@@ -10606,17 +10606,17 @@ var require_dcmjs = __commonJS({
           key: "readBytes",
           value: function readBytes(stream, length2) {
             var BACKSLASH = String.fromCharCode(VM_DELIMITER);
-            var is = stream.readAsciiString(length2).trim();
-            is = is.replace(/[^0-9.\\\-+e]/gi, "");
-            if (is.indexOf(BACKSLASH) !== -1) {
-              var integerStringArray = is.split(BACKSLASH);
-              is = integerStringArray.map(function(is2) {
-                return is2 === "" ? null : Number(is2);
+            var is2 = stream.readAsciiString(length2).trim();
+            is2 = is2.replace(/[^0-9.\\\-+e]/gi, "");
+            if (is2.indexOf(BACKSLASH) !== -1) {
+              var integerStringArray = is2.split(BACKSLASH);
+              is2 = integerStringArray.map(function(is3) {
+                return is3 === "" ? null : Number(is3);
               });
             } else {
-              is = [is === "" ? null : Number(is)];
+              is2 = [is2 === "" ? null : Number(is2)];
             }
-            return is;
+            return is2;
           }
         }, {
           key: "formatValue",
@@ -10627,8 +10627,8 @@ var require_dcmjs = __commonJS({
           key: "writeBytes",
           value: function writeBytes(stream, value, writeOptions) {
             var _this12 = this;
-            var val = Array.isArray(value) ? value.map(function(is) {
-              return _this12.formatValue(is);
+            var val = Array.isArray(value) ? value.map(function(is2) {
+              return _this12.formatValue(is2);
             }) : [this.formatValue(value)];
             return _get(_getPrototypeOf(IntegerString2.prototype), "writeBytes", this).call(this, stream, val, writeOptions);
           }
@@ -10845,12 +10845,12 @@ var require_dcmjs = __commonJS({
                   if (undef) {
                     var stack = 0;
                     while (1) {
-                      var g3 = stream.readUint16();
-                      if (g3 == 65534) {
-                        var ge2 = stream.readUint16();
+                      var g2 = stream.readUint16();
+                      if (g2 == 65534) {
+                        var ge = stream.readUint16();
                         var itemLength = stream.readUint32();
                         stream.increment(-4);
-                        if (ge2 == 57357) {
+                        if (ge == 57357) {
                           if (itemLength === 0) {
                             stack--;
                             if (stack < 0) {
@@ -10863,7 +10863,7 @@ var require_dcmjs = __commonJS({
                           } else {
                             toRead += 2;
                           }
-                        } else if (ge2 == 57344) {
+                        } else if (ge == 57344) {
                           toRead += 4;
                           if (itemLength == 4294967295) {
                             stack++;
@@ -11432,7 +11432,7 @@ var require_dcmjs = __commonJS({
                       log.error("No value representation given for", naturalName);
                     }
                   }
-                  var vr2 = ValueRepresentation.createByTypeString(dataItem.vr);
+                  var vr = ValueRepresentation.createByTypeString(dataItem.vr);
                   dataItem.Value = DicomMetaDictionary2.denaturalizeValue(dataItem.Value);
                   if (entry.vr == "SQ") {
                     var unnaturalValues = [];
@@ -11442,11 +11442,11 @@ var require_dcmjs = __commonJS({
                     }
                     dataItem.Value = unnaturalValues;
                   }
-                  if (!vr2.isBinary() && vr2.maxLength) {
+                  if (!vr.isBinary() && vr.maxLength) {
                     dataItem.Value = dataItem.Value.map(function(value) {
-                      if (value.length > vr2.maxLength) {
-                        log.warn("Truncating value ".concat(value, " of ").concat(naturalName, " because it is longer than ").concat(vr2.maxLength));
-                        return value.slice(0, vr2.maxLength);
+                      if (value.length > vr.maxLength) {
+                        log.warn("Truncating value ".concat(value, " of ").concat(naturalName, " because it is longer than ").concat(vr.maxLength));
+                        return value.slice(0, vr.maxLength);
                       } else {
                         return value;
                       }
@@ -11727,9 +11727,9 @@ var require_dcmjs = __commonJS({
           }
         }, {
           key: "writeTagObject",
-          value: function writeTagObject(stream, tagString, vr2, values, syntax, writeOptions) {
+          value: function writeTagObject(stream, tagString, vr, values, syntax, writeOptions) {
             var tag = Tag.fromString(tagString);
-            tag.write(stream, vr2, values, syntax, writeOptions);
+            tag.write(stream, vr, values, syntax, writeOptions);
           }
         }, {
           key: "write",
@@ -11763,7 +11763,7 @@ var require_dcmjs = __commonJS({
                 };
               }
             }
-            var length2 = null, vr2 = null, vrType;
+            var length2 = null, vr = null, vrType;
             if (implicit) {
               length2 = stream.readUint32();
               var elementData = DicomMessage2.lookupTag(tag);
@@ -11782,11 +11782,11 @@ var require_dcmjs = __commonJS({
                   vrType = "UN";
                 }
               }
-              vr2 = ValueRepresentation.createByTypeString(vrType);
+              vr = ValueRepresentation.createByTypeString(vrType);
             } else {
               vrType = stream.readVR();
-              vr2 = ValueRepresentation.createByTypeString(vrType);
-              if (vr2.isExplicit()) {
+              vr = ValueRepresentation.createByTypeString(vrType);
+              if (vr.isExplicit()) {
                 stream.increment(2);
                 length2 = stream.readUint32();
               } else {
@@ -11794,21 +11794,21 @@ var require_dcmjs = __commonJS({
               }
             }
             var values = [];
-            if (vr2.isBinary() && length2 > vr2.maxLength && !vr2.noMultiple) {
-              var times = length2 / vr2.maxLength, i2 = 0;
+            if (vr.isBinary() && length2 > vr.maxLength && !vr.noMultiple) {
+              var times = length2 / vr.maxLength, i2 = 0;
               while (i2++ < times) {
-                values.push(vr2.read(stream, vr2.maxLength, syntax));
+                values.push(vr.read(stream, vr.maxLength, syntax));
               }
             } else {
-              var val = vr2.read(stream, length2, syntax);
-              if (!vr2.isBinary() && singleVRs.indexOf(vr2.type) == -1) {
+              var val = vr.read(stream, length2, syntax);
+              if (!vr.isBinary() && singleVRs.indexOf(vr.type) == -1) {
                 values = val;
                 if (typeof val === "string") {
                   values = val.split(String.fromCharCode(VM_DELIMITER));
                 }
-              } else if (vr2.type == "SQ") {
+              } else if (vr.type == "SQ") {
                 values = val;
-              } else if (vr2.type == "OW" || vr2.type == "OB") {
+              } else if (vr.type == "OW" || vr.type == "OB") {
                 values = val;
               } else {
                 Array.isArray(val) ? values = val : values.push(val);
@@ -11817,7 +11817,7 @@ var require_dcmjs = __commonJS({
             stream.setEndian(oldEndian);
             var retObj = ValueRepresentation.addTagAccessors({
               tag,
-              vr: vr2
+              vr
             });
             retObj.values = values;
             return retObj;
@@ -11839,12 +11839,12 @@ var require_dcmjs = __commonJS({
         }
         _createClass(DicomDict2, [{
           key: "upsertTag",
-          value: function upsertTag(tag, vr2, values) {
+          value: function upsertTag(tag, vr, values) {
             if (this.dict[tag]) {
               this.dict[tag].Value = values;
             } else {
               this.dict[tag] = ValueRepresentation.addTagAccessors({
-                vr: vr2
+                vr
               });
               this.dict[tag].Value = values;
             }
@@ -12064,21 +12064,21 @@ var require_dcmjs = __commonJS({
           key: "rgb2XYZ",
           value: function rgb2XYZ(rgb) {
             var R2 = Colors2.invGammaCorrection(rgb[0]);
-            var G = Colors2.invGammaCorrection(rgb[1]);
-            var B = Colors2.invGammaCorrection(rgb[2]);
-            return [0.41239558896741424 * R2 + 0.3575834307637148 * G + 0.18049264738170157 * B, 0.21258623078559555 * R2 + 0.7151703037034108 * G + 0.07220049864333623 * B, 0.019297215491746945 * R2 + 0.11918386458084854 * G + 0.9504971251315798 * B];
+            var G2 = Colors2.invGammaCorrection(rgb[1]);
+            var B2 = Colors2.invGammaCorrection(rgb[2]);
+            return [0.41239558896741424 * R2 + 0.3575834307637148 * G2 + 0.18049264738170157 * B2, 0.21258623078559555 * R2 + 0.7151703037034108 * G2 + 0.07220049864333623 * B2, 0.019297215491746945 * R2 + 0.11918386458084854 * G2 + 0.9504971251315798 * B2];
           }
         }, {
           key: "xyz2LAB",
           value: function xyz2LAB(xyz) {
             var whitePoint = Colors2.d65WhitePointXYZ();
             var X2 = xyz[0] / whitePoint[0];
-            var Y2 = xyz[1] / whitePoint[1];
+            var Y = xyz[1] / whitePoint[1];
             var Z2 = xyz[2] / whitePoint[2];
             X2 = Colors2.labf(X2);
-            Y2 = Colors2.labf(Y2);
+            Y = Colors2.labf(Y);
             Z2 = Colors2.labf(Z2);
-            return [116 * Y2 - 16, 500 * (X2 - Y2), 200 * (Y2 - Z2)];
+            return [116 * Y - 16, 500 * (X2 - Y), 200 * (Y - Z2)];
           }
         }, {
           key: "lab2RGB",
@@ -15287,11 +15287,11 @@ var require_dcmjs = __commonJS({
       var RANDOM = Math.random;
       if (!Math.hypot)
         Math.hypot = function() {
-          var y = 0, i2 = arguments.length;
+          var y2 = 0, i2 = arguments.length;
           while (i2--) {
-            y += arguments[i2] * arguments[i2];
+            y2 += arguments[i2] * arguments[i2];
           }
-          return Math.sqrt(y);
+          return Math.sqrt(y2);
         };
       function create() {
         var out = new ARRAY_TYPE(3);
@@ -15311,14 +15311,14 @@ var require_dcmjs = __commonJS({
       }
       function length(a) {
         var x = a[0];
-        var y = a[1];
+        var y2 = a[1];
         var z2 = a[2];
-        return Math.hypot(x, y, z2);
+        return Math.hypot(x, y2, z2);
       }
-      function fromValues(x, y, z2) {
+      function fromValues(x, y2, z2) {
         var out = new ARRAY_TYPE(3);
         out[0] = x;
-        out[1] = y;
+        out[1] = y2;
         out[2] = z2;
         return out;
       }
@@ -15328,9 +15328,9 @@ var require_dcmjs = __commonJS({
         out[2] = a[2];
         return out;
       }
-      function set(out, x, y, z2) {
+      function set(out, x, y2, z2) {
         out[0] = x;
-        out[1] = y;
+        out[1] = y2;
         out[2] = z2;
         return out;
       }
@@ -15402,21 +15402,21 @@ var require_dcmjs = __commonJS({
       }
       function distance(a, b2) {
         var x = b2[0] - a[0];
-        var y = b2[1] - a[1];
+        var y2 = b2[1] - a[1];
         var z2 = b2[2] - a[2];
-        return Math.hypot(x, y, z2);
+        return Math.hypot(x, y2, z2);
       }
       function squaredDistance(a, b2) {
         var x = b2[0] - a[0];
-        var y = b2[1] - a[1];
+        var y2 = b2[1] - a[1];
         var z2 = b2[2] - a[2];
-        return x * x + y * y + z2 * z2;
+        return x * x + y2 * y2 + z2 * z2;
       }
       function squaredLength(a) {
         var x = a[0];
-        var y = a[1];
+        var y2 = a[1];
         var z2 = a[2];
-        return x * x + y * y + z2 * z2;
+        return x * x + y2 * y2 + z2 * z2;
       }
       function negate(out, a) {
         out[0] = -a[0];
@@ -15432,9 +15432,9 @@ var require_dcmjs = __commonJS({
       }
       function normalize$1(out, a) {
         var x = a[0];
-        var y = a[1];
+        var y2 = a[1];
         var z2 = a[2];
-        var len2 = x * x + y * y + z2 * z2;
+        var len2 = x * x + y2 * y2 + z2 * z2;
         if (len2 > 0) {
           len2 = 1 / Math.sqrt(len2);
         }
@@ -15498,25 +15498,25 @@ var require_dcmjs = __commonJS({
         return out;
       }
       function transformMat4(out, a, m3) {
-        var x = a[0], y = a[1], z2 = a[2];
-        var w2 = m3[3] * x + m3[7] * y + m3[11] * z2 + m3[15];
+        var x = a[0], y2 = a[1], z2 = a[2];
+        var w2 = m3[3] * x + m3[7] * y2 + m3[11] * z2 + m3[15];
         w2 = w2 || 1;
-        out[0] = (m3[0] * x + m3[4] * y + m3[8] * z2 + m3[12]) / w2;
-        out[1] = (m3[1] * x + m3[5] * y + m3[9] * z2 + m3[13]) / w2;
-        out[2] = (m3[2] * x + m3[6] * y + m3[10] * z2 + m3[14]) / w2;
+        out[0] = (m3[0] * x + m3[4] * y2 + m3[8] * z2 + m3[12]) / w2;
+        out[1] = (m3[1] * x + m3[5] * y2 + m3[9] * z2 + m3[13]) / w2;
+        out[2] = (m3[2] * x + m3[6] * y2 + m3[10] * z2 + m3[14]) / w2;
         return out;
       }
       function transformMat3(out, a, m3) {
-        var x = a[0], y = a[1], z2 = a[2];
-        out[0] = x * m3[0] + y * m3[3] + z2 * m3[6];
-        out[1] = x * m3[1] + y * m3[4] + z2 * m3[7];
-        out[2] = x * m3[2] + y * m3[5] + z2 * m3[8];
+        var x = a[0], y2 = a[1], z2 = a[2];
+        out[0] = x * m3[0] + y2 * m3[3] + z2 * m3[6];
+        out[1] = x * m3[1] + y2 * m3[4] + z2 * m3[7];
+        out[2] = x * m3[2] + y2 * m3[5] + z2 * m3[8];
         return out;
       }
-      function transformQuat(out, a, q2) {
-        var qx = q2[0], qy = q2[1], qz = q2[2], qw = q2[3];
-        var x = a[0], y = a[1], z2 = a[2];
-        var uvx = qy * z2 - qz * y, uvy = qz * x - qx * z2, uvz = qx * y - qy * x;
+      function transformQuat(out, a, q) {
+        var qx = q[0], qy = q[1], qz = q[2], qw = q[3];
+        var x = a[0], y2 = a[1], z2 = a[2];
+        var uvx = qy * z2 - qz * y2, uvy = qz * x - qx * z2, uvz = qx * y2 - qy * x;
         var uuvx = qy * uvz - qz * uvy, uuvy = qz * uvx - qx * uvz, uuvz = qx * uvy - qy * uvx;
         var w2 = qw * 2;
         uvx *= w2;
@@ -15526,7 +15526,7 @@ var require_dcmjs = __commonJS({
         uuvy *= 2;
         uuvz *= 2;
         out[0] = x + uvx + uuvx;
-        out[1] = y + uvy + uuvy;
+        out[1] = y2 + uvy + uuvy;
         out[2] = z2 + uvz + uuvz;
         return out;
       }
@@ -18194,10 +18194,10 @@ var require_dcmjs = __commonJS({
         rgba.push(255);
         return rgba;
       }
-      function cross(x, y, out) {
-        var Zx = x[1] * y[2] - x[2] * y[1];
-        var Zy = x[2] * y[0] - x[0] * y[2];
-        var Zz = x[0] * y[1] - x[1] * y[0];
+      function cross(x, y2, out) {
+        var Zx = x[1] * y2[2] - x[2] * y2[1];
+        var Zy = x[2] * y2[0] - x[0] * y2[2];
+        var Zz = x[0] * y2[1] - x[1] * y2[0];
         out[0] = Zx;
         out[1] = Zy;
         out[2] = Zz;
@@ -21714,7 +21714,7 @@ var require_dcmjs = __commonJS({
         __proto__: null,
         Comprehensive3DSR
       });
-      var sr2 = {
+      var sr = {
         coding,
         contentItems,
         documents,
@@ -22026,7 +22026,7 @@ var require_dcmjs = __commonJS({
         data,
         derivations,
         normalizers,
-        sr: sr2,
+        sr,
         utilities,
         log,
         anonymizer
@@ -22039,7 +22039,7 @@ var require_dcmjs = __commonJS({
       exports2.derivations = derivations;
       exports2.log = log;
       exports2.normalizers = normalizers;
-      exports2.sr = sr2;
+      exports2.sr = sr;
       exports2.utilities = utilities;
       Object.defineProperty(exports2, "__esModule", { value: true });
     });
@@ -25473,7 +25473,7 @@ var require_ms = __commonJS({
     var h3 = m3 * 60;
     var d3 = h3 * 24;
     var w2 = d3 * 7;
-    var y = d3 * 365.25;
+    var y2 = d3 * 365.25;
     module2.exports = function(val, options) {
       options = options || {};
       var type = typeof val;
@@ -25505,7 +25505,7 @@ var require_ms = __commonJS({
         case "yrs":
         case "yr":
         case "y":
-          return n * y;
+          return n * y2;
         case "weeks":
         case "week":
         case "w":
@@ -32199,10 +32199,10 @@ var require_stream_transform = __commonJS({
       if (data != null)
         this.push(data);
       cb(er);
-      var rs = this._readableState;
-      rs.reading = false;
-      if (rs.needReadable || rs.length < rs.highWaterMark) {
-        this._read(rs.highWaterMark);
+      var rs2 = this._readableState;
+      rs2.reading = false;
+      if (rs2.needReadable || rs2.length < rs2.highWaterMark) {
+        this._read(rs2.highWaterMark);
       }
     }
     function Transform(options) {
@@ -32250,9 +32250,9 @@ var require_stream_transform = __commonJS({
       ts.writechunk = chunk;
       ts.writeencoding = encoding;
       if (!ts.transforming) {
-        var rs = this._readableState;
-        if (ts.needTransform || rs.needReadable || rs.length < rs.highWaterMark)
-          this._read(rs.highWaterMark);
+        var rs2 = this._readableState;
+        if (ts.needTransform || rs2.needReadable || rs2.length < rs2.highWaterMark)
+          this._read(rs2.highWaterMark);
       }
     };
     Transform.prototype._read = function(n) {
@@ -32894,9 +32894,9 @@ var require_color_string = __commonJS({
     cs.to.rgb.percent = function() {
       var rgba = swizzle(arguments);
       var r4 = Math.round(rgba[0] / 255 * 100);
-      var g3 = Math.round(rgba[1] / 255 * 100);
+      var g2 = Math.round(rgba[1] / 255 * 100);
       var b2 = Math.round(rgba[2] / 255 * 100);
-      return rgba.length < 4 || rgba[3] === 1 ? "rgb(" + r4 + "%, " + g3 + "%, " + b2 + "%)" : "rgba(" + r4 + "%, " + g3 + "%, " + b2 + "%, " + rgba[3] + ")";
+      return rgba.length < 4 || rgba[3] === 1 ? "rgb(" + r4 + "%, " + g2 + "%, " + b2 + "%)" : "rgba(" + r4 + "%, " + g2 + "%, " + b2 + "%, " + rgba[3] + ")";
     };
     cs.to.hsl = function() {
       var hsla = swizzle(arguments);
@@ -32976,10 +32976,10 @@ var require_conversions = __commonJS({
     var model;
     convert.rgb.hsl = function(rgb) {
       var r4 = rgb[0] / 255;
-      var g3 = rgb[1] / 255;
+      var g2 = rgb[1] / 255;
       var b2 = rgb[2] / 255;
-      var min = Math.min(r4, g3, b2);
-      var max = Math.max(r4, g3, b2);
+      var min = Math.min(r4, g2, b2);
+      var max = Math.max(r4, g2, b2);
       var delta = max - min;
       var h3;
       var s;
@@ -32987,11 +32987,11 @@ var require_conversions = __commonJS({
       if (max === min) {
         h3 = 0;
       } else if (r4 === max) {
-        h3 = (g3 - b2) / delta;
-      } else if (g3 === max) {
+        h3 = (g2 - b2) / delta;
+      } else if (g2 === max) {
         h3 = 2 + (b2 - r4) / delta;
       } else if (b2 === max) {
-        h3 = 4 + (r4 - g3) / delta;
+        h3 = 4 + (r4 - g2) / delta;
       }
       h3 = Math.min(h3 * 60, 360);
       if (h3 < 0) {
@@ -33014,10 +33014,10 @@ var require_conversions = __commonJS({
       var h3;
       var s;
       var r4 = rgb[0] / 255;
-      var g3 = rgb[1] / 255;
+      var g2 = rgb[1] / 255;
       var b2 = rgb[2] / 255;
-      var v3 = Math.max(r4, g3, b2);
-      var diff = v3 - Math.min(r4, g3, b2);
+      var v3 = Math.max(r4, g2, b2);
+      var diff = v3 - Math.min(r4, g2, b2);
       var diffc = function(c3) {
         return (v3 - c3) / 6 / diff + 1 / 2;
       };
@@ -33026,11 +33026,11 @@ var require_conversions = __commonJS({
       } else {
         s = diff / v3;
         rdif = diffc(r4);
-        gdif = diffc(g3);
+        gdif = diffc(g2);
         bdif = diffc(b2);
         if (r4 === v3) {
           h3 = bdif - gdif;
-        } else if (g3 === v3) {
+        } else if (g2 === v3) {
           h3 = 1 / 3 + rdif - bdif;
         } else if (b2 === v3) {
           h3 = 2 / 3 + gdif - rdif;
@@ -33049,29 +33049,29 @@ var require_conversions = __commonJS({
     };
     convert.rgb.hwb = function(rgb) {
       var r4 = rgb[0];
-      var g3 = rgb[1];
+      var g2 = rgb[1];
       var b2 = rgb[2];
       var h3 = convert.rgb.hsl(rgb)[0];
-      var w2 = 1 / 255 * Math.min(r4, Math.min(g3, b2));
-      b2 = 1 - 1 / 255 * Math.max(r4, Math.max(g3, b2));
+      var w2 = 1 / 255 * Math.min(r4, Math.min(g2, b2));
+      b2 = 1 - 1 / 255 * Math.max(r4, Math.max(g2, b2));
       return [h3, w2 * 100, b2 * 100];
     };
     convert.rgb.cmyk = function(rgb) {
       var r4 = rgb[0] / 255;
-      var g3 = rgb[1] / 255;
+      var g2 = rgb[1] / 255;
       var b2 = rgb[2] / 255;
       var c3;
       var m3;
-      var y;
+      var y2;
       var k2;
-      k2 = Math.min(1 - r4, 1 - g3, 1 - b2);
+      k2 = Math.min(1 - r4, 1 - g2, 1 - b2);
       c3 = (1 - r4 - k2) / (1 - k2) || 0;
-      m3 = (1 - g3 - k2) / (1 - k2) || 0;
-      y = (1 - b2 - k2) / (1 - k2) || 0;
-      return [c3 * 100, m3 * 100, y * 100, k2 * 100];
+      m3 = (1 - g2 - k2) / (1 - k2) || 0;
+      y2 = (1 - b2 - k2) / (1 - k2) || 0;
+      return [c3 * 100, m3 * 100, y2 * 100, k2 * 100];
     };
-    function comparativeDistance(x, y) {
-      return Math.pow(x[0] - y[0], 2) + Math.pow(x[1] - y[1], 2) + Math.pow(x[2] - y[2], 2);
+    function comparativeDistance(x, y2) {
+      return Math.pow(x[0] - y2[0], 2) + Math.pow(x[1] - y2[1], 2) + Math.pow(x[2] - y2[2], 2);
     }
     convert.rgb.keyword = function(rgb) {
       var reversed = reverseKeywords[rgb];
@@ -33097,33 +33097,33 @@ var require_conversions = __commonJS({
     };
     convert.rgb.xyz = function(rgb) {
       var r4 = rgb[0] / 255;
-      var g3 = rgb[1] / 255;
+      var g2 = rgb[1] / 255;
       var b2 = rgb[2] / 255;
       r4 = r4 > 0.04045 ? Math.pow((r4 + 0.055) / 1.055, 2.4) : r4 / 12.92;
-      g3 = g3 > 0.04045 ? Math.pow((g3 + 0.055) / 1.055, 2.4) : g3 / 12.92;
+      g2 = g2 > 0.04045 ? Math.pow((g2 + 0.055) / 1.055, 2.4) : g2 / 12.92;
       b2 = b2 > 0.04045 ? Math.pow((b2 + 0.055) / 1.055, 2.4) : b2 / 12.92;
-      var x = r4 * 0.4124 + g3 * 0.3576 + b2 * 0.1805;
-      var y = r4 * 0.2126 + g3 * 0.7152 + b2 * 0.0722;
-      var z2 = r4 * 0.0193 + g3 * 0.1192 + b2 * 0.9505;
-      return [x * 100, y * 100, z2 * 100];
+      var x = r4 * 0.4124 + g2 * 0.3576 + b2 * 0.1805;
+      var y2 = r4 * 0.2126 + g2 * 0.7152 + b2 * 0.0722;
+      var z2 = r4 * 0.0193 + g2 * 0.1192 + b2 * 0.9505;
+      return [x * 100, y2 * 100, z2 * 100];
     };
     convert.rgb.lab = function(rgb) {
       var xyz = convert.rgb.xyz(rgb);
       var x = xyz[0];
-      var y = xyz[1];
+      var y2 = xyz[1];
       var z2 = xyz[2];
       var l2;
       var a;
       var b2;
       x /= 95.047;
-      y /= 100;
+      y2 /= 100;
       z2 /= 108.883;
       x = x > 8856e-6 ? Math.pow(x, 1 / 3) : 7.787 * x + 16 / 116;
-      y = y > 8856e-6 ? Math.pow(y, 1 / 3) : 7.787 * y + 16 / 116;
+      y2 = y2 > 8856e-6 ? Math.pow(y2, 1 / 3) : 7.787 * y2 + 16 / 116;
       z2 = z2 > 8856e-6 ? Math.pow(z2, 1 / 3) : 7.787 * z2 + 16 / 116;
-      l2 = 116 * y - 16;
-      a = 500 * (x - y);
-      b2 = 200 * (y - z2);
+      l2 = 116 * y2 - 16;
+      a = 500 * (x - y2);
+      b2 = 200 * (y2 - z2);
       return [l2, a, b2];
     };
     convert.hsl.rgb = function(hsl) {
@@ -33189,22 +33189,22 @@ var require_conversions = __commonJS({
       var hi2 = Math.floor(h3) % 6;
       var f = h3 - Math.floor(h3);
       var p3 = 255 * v3 * (1 - s);
-      var q2 = 255 * v3 * (1 - s * f);
+      var q = 255 * v3 * (1 - s * f);
       var t = 255 * v3 * (1 - s * (1 - f));
       v3 *= 255;
       switch (hi2) {
         case 0:
           return [v3, t, p3];
         case 1:
-          return [q2, v3, p3];
+          return [q, v3, p3];
         case 2:
           return [p3, v3, t];
         case 3:
-          return [p3, q2, v3];
+          return [p3, q, v3];
         case 4:
           return [t, p3, v3];
         case 5:
-          return [v3, p3, q2];
+          return [v3, p3, q];
       }
     };
     convert.hsv.hsl = function(hsv) {
@@ -33244,91 +33244,91 @@ var require_conversions = __commonJS({
       }
       n = wh + f * (v3 - wh);
       var r4;
-      var g3;
+      var g2;
       var b2;
       switch (i2) {
         default:
         case 6:
         case 0:
           r4 = v3;
-          g3 = n;
+          g2 = n;
           b2 = wh;
           break;
         case 1:
           r4 = n;
-          g3 = v3;
+          g2 = v3;
           b2 = wh;
           break;
         case 2:
           r4 = wh;
-          g3 = v3;
+          g2 = v3;
           b2 = n;
           break;
         case 3:
           r4 = wh;
-          g3 = n;
+          g2 = n;
           b2 = v3;
           break;
         case 4:
           r4 = n;
-          g3 = wh;
+          g2 = wh;
           b2 = v3;
           break;
         case 5:
           r4 = v3;
-          g3 = wh;
+          g2 = wh;
           b2 = n;
           break;
       }
-      return [r4 * 255, g3 * 255, b2 * 255];
+      return [r4 * 255, g2 * 255, b2 * 255];
     };
     convert.cmyk.rgb = function(cmyk) {
       var c3 = cmyk[0] / 100;
       var m3 = cmyk[1] / 100;
-      var y = cmyk[2] / 100;
+      var y2 = cmyk[2] / 100;
       var k2 = cmyk[3] / 100;
       var r4;
-      var g3;
+      var g2;
       var b2;
       r4 = 1 - Math.min(1, c3 * (1 - k2) + k2);
-      g3 = 1 - Math.min(1, m3 * (1 - k2) + k2);
-      b2 = 1 - Math.min(1, y * (1 - k2) + k2);
-      return [r4 * 255, g3 * 255, b2 * 255];
+      g2 = 1 - Math.min(1, m3 * (1 - k2) + k2);
+      b2 = 1 - Math.min(1, y2 * (1 - k2) + k2);
+      return [r4 * 255, g2 * 255, b2 * 255];
     };
     convert.xyz.rgb = function(xyz) {
       var x = xyz[0] / 100;
-      var y = xyz[1] / 100;
+      var y2 = xyz[1] / 100;
       var z2 = xyz[2] / 100;
       var r4;
-      var g3;
+      var g2;
       var b2;
-      r4 = x * 3.2406 + y * -1.5372 + z2 * -0.4986;
-      g3 = x * -0.9689 + y * 1.8758 + z2 * 0.0415;
-      b2 = x * 0.0557 + y * -0.204 + z2 * 1.057;
+      r4 = x * 3.2406 + y2 * -1.5372 + z2 * -0.4986;
+      g2 = x * -0.9689 + y2 * 1.8758 + z2 * 0.0415;
+      b2 = x * 0.0557 + y2 * -0.204 + z2 * 1.057;
       r4 = r4 > 31308e-7 ? 1.055 * Math.pow(r4, 1 / 2.4) - 0.055 : r4 * 12.92;
-      g3 = g3 > 31308e-7 ? 1.055 * Math.pow(g3, 1 / 2.4) - 0.055 : g3 * 12.92;
+      g2 = g2 > 31308e-7 ? 1.055 * Math.pow(g2, 1 / 2.4) - 0.055 : g2 * 12.92;
       b2 = b2 > 31308e-7 ? 1.055 * Math.pow(b2, 1 / 2.4) - 0.055 : b2 * 12.92;
       r4 = Math.min(Math.max(0, r4), 1);
-      g3 = Math.min(Math.max(0, g3), 1);
+      g2 = Math.min(Math.max(0, g2), 1);
       b2 = Math.min(Math.max(0, b2), 1);
-      return [r4 * 255, g3 * 255, b2 * 255];
+      return [r4 * 255, g2 * 255, b2 * 255];
     };
     convert.xyz.lab = function(xyz) {
       var x = xyz[0];
-      var y = xyz[1];
+      var y2 = xyz[1];
       var z2 = xyz[2];
       var l2;
       var a;
       var b2;
       x /= 95.047;
-      y /= 100;
+      y2 /= 100;
       z2 /= 108.883;
       x = x > 8856e-6 ? Math.pow(x, 1 / 3) : 7.787 * x + 16 / 116;
-      y = y > 8856e-6 ? Math.pow(y, 1 / 3) : 7.787 * y + 16 / 116;
+      y2 = y2 > 8856e-6 ? Math.pow(y2, 1 / 3) : 7.787 * y2 + 16 / 116;
       z2 = z2 > 8856e-6 ? Math.pow(z2, 1 / 3) : 7.787 * z2 + 16 / 116;
-      l2 = 116 * y - 16;
-      a = 500 * (x - y);
-      b2 = 200 * (y - z2);
+      l2 = 116 * y2 - 16;
+      a = 500 * (x - y2);
+      b2 = 200 * (y2 - z2);
       return [l2, a, b2];
     };
     convert.lab.xyz = function(lab) {
@@ -33336,21 +33336,21 @@ var require_conversions = __commonJS({
       var a = lab[1];
       var b2 = lab[2];
       var x;
-      var y;
+      var y2;
       var z2;
-      y = (l2 + 16) / 116;
-      x = a / 500 + y;
-      z2 = y - b2 / 200;
-      var y2 = Math.pow(y, 3);
+      y2 = (l2 + 16) / 116;
+      x = a / 500 + y2;
+      z2 = y2 - b2 / 200;
+      var y22 = Math.pow(y2, 3);
       var x2 = Math.pow(x, 3);
       var z22 = Math.pow(z2, 3);
-      y = y2 > 8856e-6 ? y2 : (y - 16 / 116) / 7.787;
+      y2 = y22 > 8856e-6 ? y22 : (y2 - 16 / 116) / 7.787;
       x = x2 > 8856e-6 ? x2 : (x - 16 / 116) / 7.787;
       z2 = z22 > 8856e-6 ? z22 : (z2 - 16 / 116) / 7.787;
       x *= 95.047;
-      y *= 100;
+      y2 *= 100;
       z2 *= 108.883;
-      return [x, y, z2];
+      return [x, y2, z2];
     };
     convert.lab.lch = function(lab) {
       var l2 = lab[0];
@@ -33381,14 +33381,14 @@ var require_conversions = __commonJS({
     };
     convert.rgb.ansi16 = function(args) {
       var r4 = args[0];
-      var g3 = args[1];
+      var g2 = args[1];
       var b2 = args[2];
       var value = 1 in arguments ? arguments[1] : convert.rgb.hsv(args)[2];
       value = Math.round(value / 50);
       if (value === 0) {
         return 30;
       }
-      var ansi = 30 + (Math.round(b2 / 255) << 2 | Math.round(g3 / 255) << 1 | Math.round(r4 / 255));
+      var ansi = 30 + (Math.round(b2 / 255) << 2 | Math.round(g2 / 255) << 1 | Math.round(r4 / 255));
       if (value === 2) {
         ansi += 60;
       }
@@ -33399,9 +33399,9 @@ var require_conversions = __commonJS({
     };
     convert.rgb.ansi256 = function(args) {
       var r4 = args[0];
-      var g3 = args[1];
+      var g2 = args[1];
       var b2 = args[2];
-      if (r4 === g3 && g3 === b2) {
+      if (r4 === g2 && g2 === b2) {
         if (r4 < 8) {
           return 16;
         }
@@ -33410,7 +33410,7 @@ var require_conversions = __commonJS({
         }
         return Math.round((r4 - 8) / 247 * 24) + 232;
       }
-      var ansi = 16 + 36 * Math.round(r4 / 255 * 5) + 6 * Math.round(g3 / 255 * 5) + Math.round(b2 / 255 * 5);
+      var ansi = 16 + 36 * Math.round(r4 / 255 * 5) + 6 * Math.round(g2 / 255 * 5) + Math.round(b2 / 255 * 5);
       return ansi;
     };
     convert.ansi16.rgb = function(args) {
@@ -33424,9 +33424,9 @@ var require_conversions = __commonJS({
       }
       var mult = (~~(args > 50) + 1) * 0.5;
       var r4 = (color & 1) * mult * 255;
-      var g3 = (color >> 1 & 1) * mult * 255;
+      var g2 = (color >> 1 & 1) * mult * 255;
       var b2 = (color >> 2 & 1) * mult * 255;
-      return [r4, g3, b2];
+      return [r4, g2, b2];
     };
     convert.ansi256.rgb = function(args) {
       if (args >= 232) {
@@ -33436,9 +33436,9 @@ var require_conversions = __commonJS({
       args -= 16;
       var rem;
       var r4 = Math.floor(args / 36) / 5 * 255;
-      var g3 = Math.floor((rem = args % 36) / 6) / 5 * 255;
+      var g2 = Math.floor((rem = args % 36) / 6) / 5 * 255;
       var b2 = rem % 6 / 5 * 255;
-      return [r4, g3, b2];
+      return [r4, g2, b2];
     };
     convert.rgb.hex = function(args) {
       var integer = ((Math.round(args[0]) & 255) << 16) + ((Math.round(args[1]) & 255) << 8) + (Math.round(args[2]) & 255);
@@ -33458,16 +33458,16 @@ var require_conversions = __commonJS({
       }
       var integer = parseInt(colorString, 16);
       var r4 = integer >> 16 & 255;
-      var g3 = integer >> 8 & 255;
+      var g2 = integer >> 8 & 255;
       var b2 = integer & 255;
-      return [r4, g3, b2];
+      return [r4, g2, b2];
     };
     convert.rgb.hcg = function(rgb) {
       var r4 = rgb[0] / 255;
-      var g3 = rgb[1] / 255;
+      var g2 = rgb[1] / 255;
       var b2 = rgb[2] / 255;
-      var max = Math.max(Math.max(r4, g3), b2);
-      var min = Math.min(Math.min(r4, g3), b2);
+      var max = Math.max(Math.max(r4, g2), b2);
+      var min = Math.min(Math.min(r4, g2), b2);
       var chroma = max - min;
       var grayscale;
       var hue;
@@ -33479,11 +33479,11 @@ var require_conversions = __commonJS({
       if (chroma <= 0) {
         hue = 0;
       } else if (max === r4) {
-        hue = (g3 - b2) / chroma % 6;
-      } else if (max === g3) {
+        hue = (g2 - b2) / chroma % 6;
+      } else if (max === g2) {
         hue = 2 + (b2 - r4) / chroma;
       } else {
-        hue = 4 + (r4 - g3) / chroma + 4;
+        hue = 4 + (r4 - g2) / chroma + 4;
       }
       hue /= 6;
       hue %= 1;
@@ -33517,9 +33517,9 @@ var require_conversions = __commonJS({
     convert.hcg.rgb = function(hcg) {
       var h3 = hcg[0] / 360;
       var c3 = hcg[1] / 100;
-      var g3 = hcg[2] / 100;
+      var g2 = hcg[2] / 100;
       if (c3 === 0) {
-        return [g3 * 255, g3 * 255, g3 * 255];
+        return [g2 * 255, g2 * 255, g2 * 255];
       }
       var pure = [0, 0, 0];
       var hi2 = h3 % 1 * 6;
@@ -33557,7 +33557,7 @@ var require_conversions = __commonJS({
           pure[1] = 0;
           pure[2] = w2;
       }
-      mg = (1 - c3) * g3;
+      mg = (1 - c3) * g2;
       return [
         (c3 * pure[0] + mg) * 255,
         (c3 * pure[1] + mg) * 255,
@@ -33566,8 +33566,8 @@ var require_conversions = __commonJS({
     };
     convert.hcg.hsv = function(hcg) {
       var c3 = hcg[1] / 100;
-      var g3 = hcg[2] / 100;
-      var v3 = c3 + g3 * (1 - c3);
+      var g2 = hcg[2] / 100;
+      var v3 = c3 + g2 * (1 - c3);
       var f = 0;
       if (v3 > 0) {
         f = c3 / v3;
@@ -33576,8 +33576,8 @@ var require_conversions = __commonJS({
     };
     convert.hcg.hsl = function(hcg) {
       var c3 = hcg[1] / 100;
-      var g3 = hcg[2] / 100;
-      var l2 = g3 * (1 - c3) + 0.5 * c3;
+      var g2 = hcg[2] / 100;
+      var l2 = g2 * (1 - c3) + 0.5 * c3;
       var s = 0;
       if (l2 > 0 && l2 < 0.5) {
         s = c3 / (2 * l2);
@@ -33588,8 +33588,8 @@ var require_conversions = __commonJS({
     };
     convert.hcg.hwb = function(hcg) {
       var c3 = hcg[1] / 100;
-      var g3 = hcg[2] / 100;
-      var v3 = c3 + g3 * (1 - c3);
+      var g2 = hcg[2] / 100;
+      var v3 = c3 + g2 * (1 - c3);
       return [hcg[0], (v3 - c3) * 100, (1 - v3) * 100];
     };
     convert.hwb.hcg = function(hwb) {
@@ -33597,11 +33597,11 @@ var require_conversions = __commonJS({
       var b2 = hwb[2] / 100;
       var v3 = 1 - b2;
       var c3 = v3 - w2;
-      var g3 = 0;
+      var g2 = 0;
       if (c3 < 1) {
-        g3 = (v3 - c3) / (1 - c3);
+        g2 = (v3 - c3) / (1 - c3);
       }
-      return [hwb[0], c3 * 100, g3 * 100];
+      return [hwb[0], c3 * 100, g2 * 100];
     };
     convert.apple.rgb = function(apple) {
       return [apple[0] / 65535 * 255, apple[1] / 65535 * 255, apple[2] / 65535 * 255];
@@ -34210,15 +34210,15 @@ var require_kuler = __commonJS({
         color[1] = color[0];
         color = color.join("");
       }
-      var r4 = color.substring(0, 2), g3 = color.substring(2, 4), b2 = color.substring(4, 6);
-      return [parseInt(r4, 16), parseInt(g3, 16), parseInt(b2, 16)];
+      var r4 = color.substring(0, 2), g2 = color.substring(2, 4), b2 = color.substring(4, 6);
+      return [parseInt(r4, 16), parseInt(g2, 16), parseInt(b2, 16)];
     };
-    Kuler.prototype.rgb = function rgb(r4, g3, b2) {
-      var red = r4 / 255 * 5, green = g3 / 255 * 5, blue = b2 / 255 * 5;
+    Kuler.prototype.rgb = function rgb(r4, g2, b2) {
+      var red = r4 / 255 * 5, green = g2 / 255 * 5, blue = b2 / 255 * 5;
       return this.ansi(red, green, blue);
     };
-    Kuler.prototype.ansi = function ansi(r4, g3, b2) {
-      var red = Math.round(r4), green = Math.round(g3), blue = Math.round(b2);
+    Kuler.prototype.ansi = function ansi(r4, g2, b2) {
+      var red = Math.round(r4), green = Math.round(g2), blue = Math.round(b2);
       return 16 + red * 36 + green * 6 + blue;
     };
     Kuler.prototype.reset = function reset() {
@@ -36851,7 +36851,7 @@ var require_dcmjs_dimse_min = __commonJS({
       "object" == typeof exports && "object" == typeof module2 ? module2.exports = t(require_async_eventemitter(), require_dcmjs(), require_smartbuffer(), require_cjs(), require_winston()) : "function" == typeof define && define.amd ? define("dcmjs-dimse", ["async-eventemitter", "dcmjs", "smart-buffer", "ts-mixer", "winston"], t) : "object" == typeof exports ? exports["dcmjs-dimse"] = t(require_async_eventemitter(), require_dcmjs(), require_smartbuffer(), require_cjs(), require_winston()) : e["dcmjs-dimse"] = t(e["async-eventemitter"], e.dcmjs, e["smart-buffer"], e["ts-mixer"], e.winston);
     }(global, (e, t, s, n, i2) => {
       return r4 = { 201: (e2, t2, s2) => {
-        const { CGetRequest: n2, CStoreRequest: i3 } = s2(406), { CommandFieldType: r5, PresentationContextResult: o2, SopClass: a, StorageClass: c3, TransferSyntax: d3, Uid: u2, UserIdentityType: h3 } = s2(855), m3 = s2(719), { EOL: g3 } = s2(37);
+        const { CGetRequest: n2, CStoreRequest: i3 } = s2(406), { CommandFieldType: r5, PresentationContextResult: o2, SopClass: a, StorageClass: c3, TransferSyntax: d3, Uid: u2, UserIdentityType: h3 } = s2(855), m3 = s2(719), { EOL: g2 } = s2(37);
         class l2 {
           constructor(e3, t3, s3, n3) {
             this.pcId = e3, this.abstractSyntaxUid = t3, this.transferSyntaxes = [], s3 && this.transferSyntaxes.push(s3), this.result = n3 || o2.Proposed;
@@ -36910,7 +36910,7 @@ var require_dcmjs_dimse_min = __commonJS({
             const e3 = [];
             return e3.push(`Presentation Context:  ${this.getPresentationContextId()} [${this.getResultDescription()}]`), e3.push(`  Abstract:  ${this.getAbstractSyntaxUid()}`), this.getTransferSyntaxUids().forEach((t3) => {
               e3.push(`      Transfer:  ${t3}`);
-            }), e3.join(g3);
+            }), e3.join(g2);
           }
         }
         e2.exports = { Association: class {
@@ -37091,7 +37091,7 @@ var require_dcmjs_dimse_min = __commonJS({
               e3.push(`  Presentation Context:  ${t3.id} [${s3.getResultDescription()}]`), e3.push(`      Abstract:  ${this._uidNameFromValue([a, c3], s3.getAbstractSyntaxUid()) || s3.getAbstractSyntaxUid()}`), s3.getTransferSyntaxUids().forEach((t4) => {
                 e3.push(`      Transfer:  ${this._uidNameFromValue(d3, t4) || t4}`);
               });
-            }), e3.push(""), e3.join(g3);
+            }), e3.push(""), e3.join(g2);
           }
           _uidNameFromValue(e3, t3) {
             const s3 = Array.isArray(e3) ? Object.assign({}, ...e3) : e3;
@@ -37133,7 +37133,7 @@ var require_dcmjs_dimse_min = __commonJS({
           }
         }, PresentationContext: l2 };
       }, 185: (e2, t2, s2) => {
-        const { Association: n2, PresentationContext: i3 } = s2(201), { TransferSyntax: r5, UserIdentityType: o2 } = s2(855), { Request: a } = s2(406), c3 = s2(988), d3 = s2(266), u2 = s2(437), h3 = s2(425), m3 = s2(808), g3 = s2(404);
+        const { Association: n2, PresentationContext: i3 } = s2(201), { TransferSyntax: r5, UserIdentityType: o2 } = s2(855), { Request: a } = s2(406), c3 = s2(988), d3 = s2(266), u2 = s2(437), h3 = s2(425), m3 = s2(808), g2 = s2(404);
         e2.exports = class extends h3 {
           constructor() {
             super(), this.requests = [], this.additionalPresentationContexts = [], this.network = void 0, this.statistics = new d3();
@@ -37165,7 +37165,7 @@ var require_dcmjs_dimse_min = __commonJS({
             });
             let h4 = {};
             a2.securityOptions && (h4 = { key: a2.securityOptions.key, cert: a2.securityOptions.cert, ca: a2.securityOptions.ca, requestCert: a2.securityOptions.requestCert, rejectUnauthorized: a2.securityOptions.rejectUnauthorized, minVersion: a2.securityOptions.minVersion, maxVersion: a2.securityOptions.maxVersion, ciphers: a2.securityOptions.ciphers }), u2.info(`Connecting to ${e3}:${t3} ${a2.securityOptions ? "(TLS)" : ""}`);
-            const l2 = (a2.securityOptions ? g3 : m3).connect({ host: e3, port: t3, ...h4 }), p3 = new c3(l2, a2);
+            const l2 = (a2.securityOptions ? g2 : m3).connect({ host: e3, port: t3, ...h4 }), p3 = new c3(l2, a2);
             p3.on("connect", () => {
               this.emit("connected"), p3.sendAssociationRequest(d4);
             }), p3.on("associationAccepted", (e4) => {
@@ -37202,7 +37202,7 @@ var require_dcmjs_dimse_min = __commonJS({
         };
       }, 406: (e2, t2, s2) => {
         const { CommandFieldType: n2, Priority: i3, SopClass: r5, Status: o2 } = s2(855), a = s2(347), { Mixin: c3 } = s2(842), { EOL: d3 } = s2(37), u2 = s2(425), h3 = s2(836), { DicomMetaDictionary: m3 } = h3.data;
-        class g3 {
+        class g2 {
           constructor(e3, t3) {
             this.commandDataset = e3 || new a(), this.dataset = t3;
           }
@@ -37281,7 +37281,7 @@ var require_dcmjs_dimse_min = __commonJS({
             }
           }
         }
-        class l2 extends c3(g3, u2) {
+        class l2 extends c3(g2, u2) {
           constructor(e3, t3, s3) {
             switch (super(new a({ CommandField: e3, CommandDataSetType: s3 ? 514 : 257 })), e3) {
               case n2.NGetRequest:
@@ -37337,7 +37337,7 @@ var require_dcmjs_dimse_min = __commonJS({
             return `${super.toString(e3)} [id: ${this.getMessageId() || ""}]`;
           }
         }
-        class p3 extends g3 {
+        class p3 extends g2 {
           constructor(e3, t3, s3, i4, r6) {
             switch (super(new a({ CommandField: e3, CommandDataSetType: s3 ? 514 : 257, Status: i4, ErrorComment: r6 })), e3) {
               case n2.NGetRequest:
@@ -37460,7 +37460,7 @@ var require_dcmjs_dimse_min = __commonJS({
             return t3.setMessageIdBeingRespondedTo(e3.getMessageId()), t3;
           }
         }
-        class y extends l2 {
+        class y2 extends l2 {
           constructor(e3) {
             super(n2.CFindRequest, r5.StudyRootQueryRetrieveInformationModelFind, false), this.setPriority(e3 || i3.Medium);
           }
@@ -37473,25 +37473,25 @@ var require_dcmjs_dimse_min = __commonJS({
           static createStudyFindRequest(e3, t3) {
             const s3 = { PatientID: "", PatientName: "", IssuerOfPatientID: "", PatientSex: "", PatientBirthDate: "", StudyInstanceUID: "", ModalitiesInStudy: "", StudyID: "", AccessionNumber: "", StudyDate: "", StudyTime: "", StudyDescription: "", NumberOfStudyRelatedSeries: "", NumberOfStudyRelatedInstances: "", ...e3 };
             s3.QueryRetrieveLevel = "STUDY";
-            const n3 = new y(t3);
+            const n3 = new y2(t3);
             return n3.setDataset(new a(s3)), n3;
           }
           static createSeriesFindRequest(e3, t3) {
             const s3 = { StudyInstanceUID: "", SeriesInstanceUID: "", SeriesNumber: "", SeriesDescription: "", Modality: "", SeriesDate: "", SeriesTime: "", NumberOfSeriesRelatedInstances: "", ...e3 };
             s3.QueryRetrieveLevel = "SERIES";
-            const n3 = new y(t3);
+            const n3 = new y2(t3);
             return n3.setDataset(new a(s3)), n3;
           }
           static createImageFindRequest(e3, t3) {
             const s3 = { StudyInstanceUID: "", SeriesInstanceUID: "", SOPInstanceUID: "", InstanceNumber: "", Modality: "", ...e3 };
             s3.QueryRetrieveLevel = "IMAGE";
-            const n3 = new y(t3);
+            const n3 = new y2(t3);
             return n3.setDataset(new a(s3)), n3;
           }
           static createWorklistFindRequest(e3, t3) {
             const s3 = { PatientID: "", PatientName: "", IssuerOfPatientID: "", PatientSex: "", PatientWeight: "", PatientBirthDate: "", MedicalAlerts: "", PregnancyStatus: "", Allergies: "", PatientComments: "", SpecialNeeds: "", PatientState: "", CurrentPatientLocation: "", InstitutionName: "", AdmissionID: "", AccessionNumber: "", ReferringPhysicianName: "", AdmittingDiagnosesDescription: "", RequestingPhysician: "", StudyInstanceUID: "", StudyDescription: "", StudyID: "", ReasonForTheRequestedProcedure: "", StudyDate: "", StudyTime: "", RequestedProcedureID: "", RequestedProcedureDescription: "", RequestedProcedurePriority: "", RequestedProcedureCodeSequence: [], ReferencedStudySequence: [], ProcedureCodeSequence: [], ScheduledProcedureStepSequence: [{ ScheduledStationAETitle: "", ScheduledStationName: "", ScheduledProcedureStepStartDate: "", ScheduledProcedureStepStartTime: "", Modality: "", ScheduledPerformingPhysicianName: "", ScheduledProcedureStepDescription: "", ScheduledProtocolCodeSequence: [], ScheduledProcedureStepLocation: "", ScheduledProcedureStepID: "", RequestedContrastAgent: "", PreMedication: "", AnatomicalOrientationType: "" }], ...e3 };
             s3.QueryRetrieveLevel = "";
-            const n3 = new y(t3);
+            const n3 = new y2(t3);
             return n3.setAffectedSopClassUid(r5.ModalityWorklistInformationModelFind), n3.setDataset(new a(s3)), n3;
           }
         }
@@ -37500,7 +37500,7 @@ var require_dcmjs_dimse_min = __commonJS({
             super(n2.CFindResponse, r5.StudyRootQueryRetrieveInformationModelFind, false, e3, t3);
           }
           static fromRequest(e3) {
-            if (!(e3 instanceof y))
+            if (!(e3 instanceof y2))
               throw new Error("Request should be an instance of CFindRequest");
             const t3 = new S2(o2.ProcessingFailure);
             return t3.setMessageIdBeingRespondedTo(e3.getMessageId()), t3;
@@ -37536,7 +37536,7 @@ var require_dcmjs_dimse_min = __commonJS({
             return t3.setMessageIdBeingRespondedTo(e3.getMessageId()), t3.setAffectedSopClassUid(e3.getAffectedSopClassUid()), t3.setAffectedSopInstanceUid(e3.getAffectedSopInstanceUid()), t3;
           }
         }
-        class P extends l2 {
+        class P2 extends l2 {
           constructor(e3) {
             super(n2.CMoveRequest, r5.StudyRootQueryRetrieveInformationModelMove, false), this.setPriority(e3 || i3.Medium);
           }
@@ -37547,15 +37547,15 @@ var require_dcmjs_dimse_min = __commonJS({
             this.getCommandDataset().setElement("Priority", e3);
           }
           static createStudyMoveRequest(e3, t3, s3) {
-            const n3 = { StudyInstanceUID: t3, QueryRetrieveLevel: "STUDY" }, i4 = new P(s3);
+            const n3 = { StudyInstanceUID: t3, QueryRetrieveLevel: "STUDY" }, i4 = new P2(s3);
             return i4.setDataset(new a(n3)), i4.getCommandDataset().setElement("MoveDestination", e3), i4;
           }
           static createSeriesMoveRequest(e3, t3, s3, n3) {
-            const i4 = { StudyInstanceUID: t3, SeriesInstanceUID: s3, QueryRetrieveLevel: "SERIES" }, r6 = new P(n3);
+            const i4 = { StudyInstanceUID: t3, SeriesInstanceUID: s3, QueryRetrieveLevel: "SERIES" }, r6 = new P2(n3);
             return r6.setDataset(new a(i4)), r6.getCommandDataset().setElement("MoveDestination", e3), r6;
           }
           static createImageMoveRequest(e3, t3, s3, n3, i4) {
-            const r6 = { StudyInstanceUID: t3, SeriesInstanceUID: s3, SOPInstanceUID: n3, QueryRetrieveLevel: "IMAGE" }, o3 = new P(i4);
+            const r6 = { StudyInstanceUID: t3, SeriesInstanceUID: s3, SOPInstanceUID: n3, QueryRetrieveLevel: "IMAGE" }, o3 = new P2(i4);
             return o3.setDataset(new a(r6)), o3.getCommandDataset().setElement("MoveDestination", e3), o3;
           }
         }
@@ -37576,7 +37576,7 @@ var require_dcmjs_dimse_min = __commonJS({
             return this.getCommandDataset().getElement("NumberOfFailedSuboperations");
           }
           static fromRequest(e3) {
-            if (!(e3 instanceof P))
+            if (!(e3 instanceof P2))
               throw new Error("Request should be an instance of CMoveRequest");
             const t3 = new v3(o2.ProcessingFailure);
             return t3.setMessageIdBeingRespondedTo(e3.getMessageId()), t3;
@@ -37650,7 +37650,7 @@ var require_dcmjs_dimse_min = __commonJS({
             return t3.setMessageIdBeingRespondedTo(e3.getMessageId()), t3;
           }
         }
-        class q2 extends l2 {
+        class q extends l2 {
           constructor(e3, t3, s3) {
             super(n2.NActionRequest, e3, false), this.setRequestedSopInstanceUid(t3), this.setActionTypeId(s3);
           }
@@ -37672,13 +37672,13 @@ var require_dcmjs_dimse_min = __commonJS({
             this.getCommandDataset().setElement("ActionTypeID", e3);
           }
           static fromRequest(e3) {
-            if (!(e3 instanceof q2))
+            if (!(e3 instanceof q))
               throw new Error("Request should be an instance of NActionRequest");
             const t3 = new D2(e3.getRequestedSopClassUid(), e3.getRequestedSopInstanceUid(), e3.getActionTypeId(), o2.ProcessingFailure);
             return t3.setMessageIdBeingRespondedTo(e3.getMessageId()), t3;
           }
         }
-        class E3 extends l2 {
+        class E2 extends l2 {
           constructor(e3, t3) {
             super(n2.NDeleteRequest, e3, false), this.setRequestedSopInstanceUid(t3);
           }
@@ -37688,7 +37688,7 @@ var require_dcmjs_dimse_min = __commonJS({
             super(n2.NDeleteResponse, e3, false, s3, i4), this.setAffectedSopInstanceUid(t3);
           }
           static fromRequest(e3) {
-            if (!(e3 instanceof E3))
+            if (!(e3 instanceof E2))
               throw new Error("Request should be an instance of NDeleteRequest");
             const t3 = new T(e3.getRequestedSopClassUid(), e3.getRequestedSopInstanceUid(), o2.ProcessingFailure);
             return t3.setMessageIdBeingRespondedTo(e3.getMessageId()), t3;
@@ -37748,14 +37748,14 @@ var require_dcmjs_dimse_min = __commonJS({
             return "0".repeat(t3 - s3.length) + s3;
           }
         }
-        class B extends p3 {
+        class B2 extends p3 {
           constructor(e3, t3, s3, i4) {
             super(n2.NGetResponse, e3, false, s3, i4), this.setAffectedSopInstanceUid(t3);
           }
           static fromRequest(e3) {
             if (!(e3 instanceof N2))
               throw new Error("Request should be an instance of NGetRequest");
-            const t3 = new B(e3.getRequestedSopClassUid(), e3.getRequestedSopInstanceUid(), o2.ProcessingFailure);
+            const t3 = new B2(e3.getRequestedSopClassUid(), e3.getRequestedSopInstanceUid(), o2.ProcessingFailure);
             return t3.setMessageIdBeingRespondedTo(e3.getMessageId()), t3;
           }
         }
@@ -37786,12 +37786,12 @@ var require_dcmjs_dimse_min = __commonJS({
             this.getCommandDataset().setElement("MessageIDBeingRespondedTo", e3);
           }
           static fromRequest(e3) {
-            if (!(e3 instanceof y || e3 instanceof P || e3 instanceof x))
+            if (!(e3 instanceof y2 || e3 instanceof P2 || e3 instanceof x))
               throw new Error("Request should be an instance of CFindRequest, CMoveRequest or CGetRequest");
             return new F(e3.getAffectedSopClassUid(), e3.getMessageId());
           }
         }
-        e2.exports = { CCancelRequest: F, CEchoRequest: R2, CEchoResponse: f, CFindRequest: y, CFindResponse: S2, CGetRequest: x, CGetResponse: w2, CMoveRequest: P, CMoveResponse: v3, Command: g3, CStoreRequest: I2, CStoreResponse: C2, NActionRequest: q2, NActionResponse: D2, NCreateRequest: A2, NCreateResponse: U2, NDeleteRequest: E3, NDeleteResponse: T, NEventReportRequest: O2, NEventReportResponse: b2, NGetRequest: N2, NGetResponse: B, NSetRequest: M2, NSetResponse: L2, Request: l2, Response: p3 };
+        e2.exports = { CCancelRequest: F, CEchoRequest: R2, CEchoResponse: f, CFindRequest: y2, CFindResponse: S2, CGetRequest: x, CGetResponse: w2, CMoveRequest: P2, CMoveResponse: v3, Command: g2, CStoreRequest: I2, CStoreResponse: C2, NActionRequest: q, NActionResponse: D2, NCreateRequest: A2, NCreateResponse: U2, NDeleteRequest: E2, NDeleteResponse: T, NEventReportRequest: O2, NEventReportResponse: b2, NGetRequest: N2, NGetResponse: B2, NSetRequest: M2, NSetResponse: L2, Request: l2, Response: p3 };
       }, 855: (e2) => {
         const t2 = { CStoreRequest: 1, CStoreResponse: 32769, CGetRequest: 16, CGetResponse: 32784, CFindRequest: 32, CFindResponse: 32800, CMoveRequest: 33, CMoveResponse: 32801, CEchoRequest: 48, CEchoResponse: 32816, NEventReportRequest: 256, NEventReportResponse: 33024, NGetRequest: 272, NGetResponse: 33040, NSetRequest: 288, NSetResponse: 33056, NActionRequest: 304, NActionResponse: 33072, NCreateRequest: 320, NCreateResponse: 33088, NDeleteRequest: 336, NDeleteResponse: 33104, CCancelRequest: 4095 };
         Object.freeze(t2);
@@ -37817,17 +37817,17 @@ var require_dcmjs_dimse_min = __commonJS({
         Object.freeze(h3);
         const m3 = { BasicTextSrStorage: "1.2.840.10008.5.1.4.1.1.88.11", BreastProjectionXRayImageStorageForPresentation: "1.2.840.10008.5.1.4.1.1.13.1.4", BreastProjectionXRayImageStorageForProcessing: "1.2.840.10008.5.1.4.1.1.13.1.5", BreastTomosynthesisImageStorage: "1.2.840.10008.5.1.4.1.1.13.1.3", ChestCadSrStorage: "1.2.840.10008.5.1.4.1.1.88.65", ComprehensiveSrStorage: "1.2.840.10008.5.1.4.1.1.88.33", ComputedRadiographyImageStorage: "1.2.840.10008.5.1.4.1.1.1", CtImageStorage: "1.2.840.10008.5.1.4.1.1.2", DigitalIntraOralXRayImageStorageForPresentation: "1.2.840.10008.5.1.4.1.1.1.3", DigitalIntraOralXRayImageStorageForProcessing: "1.2.840.10008.5.1.4.1.1.1.3.1", DigitalMammographyXRayImageStorageForPresentation: "1.2.840.10008.5.1.4.1.1.1.2", DigitalMammographyXRayImageStorageForProcessing: "1.2.840.10008.5.1.4.1.1.1.2.1", DigitalXRayImageStorageForPresentation: "1.2.840.10008.5.1.4.1.1.1.1", DigitalXRayImageStorageForProcessing: "1.2.840.10008.5.1.4.1.1.1.1.1", EncapsulatedCdaStorage: "1.2.840.10008.5.1.4.1.1.104.2", EncapsulatedPdfStorage: "1.2.840.10008.5.1.4.1.1.104.1", EnhancedCtImageStorage: "1.2.840.10008.5.1.4.1.1.2.1", EnhancedMrColorImageStorage: "1.2.840.10008.5.1.4.1.1.4.3", EnhancedMrImageStorage: "1.2.840.10008.5.1.4.1.1.4.1", EnhancedPetImageStorage: "1.2.840.10008.5.1.4.1.1.130", EnhancedSrStorage: "1.2.840.10008.5.1.4.1.1.88.22", EnhancedXaImageStorage: "1.2.840.10008.5.1.4.1.1.12.1.1", EnhancedXrfImageStorage: "1.2.840.10008.5.1.4.1.1.12.2.1", IntravascularOpticalCoherenceTomographyImageStorageForPresentation: "1.2.840.10008.5.1.4.1.1.14.1", IntravascularOpticalCoherenceTomographyImageStorageForProcessing: "1.2.840.10008.5.1.4.1.1.14.2", LegacyConvertedEnhancedCTImageStorage: "1.2.840.10008.5.1.4.1.1.2.2", LegacyConvertedEnhancedMRImageStorage: "1.2.840.10008.5.1.4.1.1.4.4", LegacyConvertedEnhancedPETImageStorage: "1.2.840.10008.5.1.4.1.1.128.1", MammographyCadSrStorage: "1.2.840.10008.5.1.4.1.1.88.50", MrImageStorage: "1.2.840.10008.5.1.4.1.1.4", MultiframeGrayscaleByteSecondaryCaptureImageStorage: "1.2.840.10008.5.1.4.1.1.7.2", MultiframeGrayscaleWordSecondaryCaptureImageStorage: "1.2.840.10008.5.1.4.1.1.7.3", MultiframeSingleBitSecondaryCaptureImageStorage: "1.2.840.10008.5.1.4.1.1.7.1", MultiframeTrueColorSecondaryCaptureImageStorage: "1.2.840.10008.5.1.4.1.1.7.4", NuclearMedicineImageStorage: "1.2.840.10008.5.1.4.1.1.20", OphthalmicOpticalCoherenceTomographyEnFaceImageStorage: "1.2.840.10008.5.1.4.1.1.77.1.5.7", OphthalmicPhotography16BitImageStorage: "1.2.840.10008.5.1.4.1.1.77.1.5.2", OphthalmicPhotography8BitImageStorage: "1.2.840.10008.5.1.4.1.1.77.1.5.1", OphthalmicTomographyImageStorage: "1.2.840.10008.5.1.4.1.1.77.1.5.4", PositronEmissionTomographyImageStorage: "1.2.840.10008.5.1.4.1.1.128", RtImageStorage: "1.2.840.10008.5.1.4.1.1.481.1", SecondaryCaptureImageStorage: "1.2.840.10008.5.1.4.1.1.7", UltrasoundImageStorage: "1.2.840.10008.5.1.4.1.1.6.1", UltrasoundMultiframeImageStorage: "1.2.840.10008.5.1.4.1.1.3.1", VideoEndoscopicImageStorage: "1.2.840.10008.5.1.4.1.1.77.1.1.1", VideoMicroscopicImageStorage: "1.2.840.10008.5.1.4.1.1.77.1.2.1", VideoPhotographicImageStorage: "1.2.840.10008.5.1.4.1.1.77.1.4.1", VlEndoscopicImageStorage: "1.2.840.10008.5.1.4.1.1.77.1.1", VlMicroscopicImageStorage: "1.2.840.10008.5.1.4.1.1.77.1.2", VlPhotographicImageStorage: "1.2.840.10008.5.1.4.1.1.77.1.4", VlSlideCoordinatesMicroscopicImageStorage: "1.2.840.10008.5.1.4.1.1.77.1.3", VlWholeSlideMicroscopyImageStorage: "1.2.840.10008.5.1.4.1.1.77.1.6", WideFieldOphthalmicPhotography3dCoordinatesImageStorage: "1.2.840.10008.5.1.4.1.1.77.1.5.6", WideFieldOphthalmicPhotographyStereographicProjectionImageStorage: "1.2.840.10008.5.1.4.1.1.77.1.5.5", XRay3dAngiographicImageStorage: "1.2.840.10008.5.1.4.1.1.13.1.1", XRay3dCraniofacialImageStorage: "1.2.840.10008.5.1.4.1.1.13.1.2", XRayAngiographicImageStorage: "1.2.840.10008.5.1.4.1.1.12.1", XRayRadiationDoseSRStorage: "1.2.840.10008.5.1.4.1.1.88.67", XRayRadiofluoroscopicImageStorage: "1.2.840.10008.5.1.4.1.1.12.2" };
         Object.freeze(m3);
-        const g3 = { Verification: "1.2.840.10008.1.1", StudyRootQueryRetrieveInformationModelFind: "1.2.840.10008.5.1.4.1.2.2.1", ModalityWorklistInformationModelFind: "1.2.840.10008.5.1.4.31", ModalityPerformedProcedureStep: "1.2.840.10008.3.1.2.3.3", StudyRootQueryRetrieveInformationModelMove: "1.2.840.10008.5.1.4.1.2.2.2", StudyRootQueryRetrieveInformationModelGet: "1.2.840.10008.5.1.4.1.2.2.3", StorageCommitmentPushModel: "1.2.840.10008.1.20.1", BasicFilmSession: "1.2.840.10008.5.1.1.1", PrintJob: "1.2.840.10008.5.1.1.14", BasicAnnotationBox: "1.2.840.10008.5.1.1.15", Printer: "1.2.840.10008.5.1.1.16", PrinterConfigurationRetrieval: "1.2.840.10008.5.1.1.16.376", BasicGrayscalePrintManagementMeta: "1.2.840.10008.5.1.1.9", BasicColorPrintManagementMeta: "1.2.840.10008.5.1.1.18", BasicFilmBox: "1.2.840.10008.5.1.1.2", PresentationLut: "1.2.840.10008.5.1.1.23", BasicGrayscaleImageBox: "1.2.840.10008.5.1.1.4", BasicColorImageBox: "1.2.840.10008.5.1.1.4.1", InstanceAvailabilityNotification: "1.2.840.10008.5.1.4.33" };
-        Object.freeze(g3);
+        const g2 = { Verification: "1.2.840.10008.1.1", StudyRootQueryRetrieveInformationModelFind: "1.2.840.10008.5.1.4.1.2.2.1", ModalityWorklistInformationModelFind: "1.2.840.10008.5.1.4.31", ModalityPerformedProcedureStep: "1.2.840.10008.3.1.2.3.3", StudyRootQueryRetrieveInformationModelMove: "1.2.840.10008.5.1.4.1.2.2.2", StudyRootQueryRetrieveInformationModelGet: "1.2.840.10008.5.1.4.1.2.2.3", StorageCommitmentPushModel: "1.2.840.10008.1.20.1", BasicFilmSession: "1.2.840.10008.5.1.1.1", PrintJob: "1.2.840.10008.5.1.1.14", BasicAnnotationBox: "1.2.840.10008.5.1.1.15", Printer: "1.2.840.10008.5.1.1.16", PrinterConfigurationRetrieval: "1.2.840.10008.5.1.1.16.376", BasicGrayscalePrintManagementMeta: "1.2.840.10008.5.1.1.9", BasicColorPrintManagementMeta: "1.2.840.10008.5.1.1.18", BasicFilmBox: "1.2.840.10008.5.1.1.2", PresentationLut: "1.2.840.10008.5.1.1.23", BasicGrayscaleImageBox: "1.2.840.10008.5.1.1.4", BasicColorImageBox: "1.2.840.10008.5.1.1.4.1", InstanceAvailabilityNotification: "1.2.840.10008.5.1.4.33" };
+        Object.freeze(g2);
         const l2 = { ImplicitVRLittleEndian: "1.2.840.10008.1.2", ExplicitVRLittleEndian: "1.2.840.10008.1.2.1", DeflatedExplicitVRLittleEndian: "1.2.840.10008.1.2.1.99", ExplicitVRBigEndian: "1.2.840.10008.1.2.2", RleLossless: "1.2.840.10008.1.2.5", JpegBaseline: "1.2.840.10008.1.2.4.50", JpegLossless: "1.2.840.10008.1.2.4.70", JpegLsLossless: "1.2.840.10008.1.2.4.80", JpegLsLossy: "1.2.840.10008.1.2.4.81", Jpeg2000Lossless: "1.2.840.10008.1.2.4.90", Jpeg2000Lossy: "1.2.840.10008.1.2.4.91" };
         Object.freeze(l2);
         const p3 = [l2.ImplicitVRLittleEndian, l2.ExplicitVRLittleEndian];
         Object.freeze(p3);
         const R2 = { ImplementationClassUid: "1.2.826.0.1.3680043.10.854", ImplementationVersion: "DCMJS-DIMSE-V0.1", MaxPduLength: 262144 };
-        Object.freeze(R2), e2.exports = { AbortReason: r5, AbortSource: i3, CommandFieldType: t2, DefaultImplementation: R2, PresentationContextResult: s2, Priority: d3, RejectReason: c3, RejectResult: o2, RejectSource: a, SopClass: g3, Status: u2, StorageClass: m3, TranscodableTransferSyntaxes: p3, TransferSyntax: l2, Uid: h3, UserIdentityType: n2 };
+        Object.freeze(R2), e2.exports = { AbortReason: r5, AbortSource: i3, CommandFieldType: t2, DefaultImplementation: R2, PresentationContextResult: s2, Priority: d3, RejectReason: c3, RejectResult: o2, RejectSource: a, SopClass: g2, Status: u2, StorageClass: m3, TranscodableTransferSyntaxes: p3, TransferSyntax: l2, Uid: h3, UserIdentityType: n2 };
       }, 347: (e2, t2, s2) => {
-        const { StorageClass: n2, TransferSyntax: i3 } = s2(855), r5 = s2(719), { readFile: o2, readFileSync: a, writeFile: c3, writeFileSync: d3 } = s2(147), { EOL: u2 } = s2(37), h3 = s2(836), { DicomDict: m3, DicomMessage: g3, DicomMetaDictionary: l2, ReadBufferStream: p3, WriteBufferStream: R2 } = h3.data, f = h3.log;
-        class y {
+        const { StorageClass: n2, TransferSyntax: i3 } = s2(855), r5 = s2(719), { readFile: o2, readFileSync: a, writeFile: c3, writeFileSync: d3 } = s2(147), { EOL: u2 } = s2(37), h3 = s2(836), { DicomDict: m3, DicomMessage: g2, DicomMetaDictionary: l2, ReadBufferStream: p3, WriteBufferStream: R2 } = h3.data, f = h3.log;
+        class y2 {
           constructor(e3, t3, s3) {
             s3 = s3 || {}, s3 = { ignoreErrors: true, ...s3 }, f.level = "error", this.transferSyntaxUid = t3 || i3.ImplicitVRLittleEndian, Buffer.isBuffer(e3) ? this.elements = this._fromElementsBuffer(e3, this.transferSyntaxUid, s3) : this.elements = e3 || {};
           }
@@ -37848,11 +37848,11 @@ var require_dcmjs_dimse_min = __commonJS({
           }
           getDenaturalizedDataset(e3, t3) {
             const s3 = t3 ? l2.denaturalizeDataset(this.getElements(), { ...l2.nameMap, ...t3 }) : l2.denaturalizeDataset(this.getElements()), n3 = new R2();
-            return g3.write(s3, n3, this.transferSyntaxUid, e3), Buffer.from(n3.getBuffer());
+            return g2.write(s3, n3, this.transferSyntaxUid, e3), Buffer.from(n3.getBuffer());
           }
           getDenaturalizedCommandDataset() {
             const e3 = l2.denaturalizeDataset(this.getElements()), t3 = new R2(), s3 = new R2();
-            return g3.write(e3, s3, i3.ImplicitVRLittleEndian, {}), g3.writeTagObject(t3, "00000000", "UL", s3.size, i3.ImplicitVRLittleEndian, {}), t3.concat(s3), Buffer.from(t3.getBuffer());
+            return g2.write(e3, s3, i3.ImplicitVRLittleEndian, {}), g2.writeTagObject(t3, "00000000", "UL", s3.size, i3.ImplicitVRLittleEndian, {}), t3.concat(s3), Buffer.from(t3.getBuffer());
           }
           static fromFile(e3, t3, s3) {
             if (!(void 0 !== t3 && t3 instanceof Function))
@@ -37869,7 +37869,7 @@ var require_dcmjs_dimse_min = __commonJS({
             });
           }
           toFile(e3, t3, s3, i4) {
-            const o3 = { _meta: { FileMetaInformationVersion: new Uint8Array([0, 1]).buffer, MediaStorageSOPClassUID: this.getElement("SOPClassUID") || n2.SecondaryCaptureImageStorage, MediaStorageSOPInstanceUID: this.getElement("SOPInstanceUID") || y.generateDerivedUid(), TransferSyntaxUID: this.getTransferSyntaxUid(), ImplementationClassUID: r5.getImplementationClassUid(), ImplementationVersionName: r5.getImplementationVersion() }, ...this.getElements() }, a2 = l2.denaturalizeDataset(o3._meta), u3 = new m3(a2);
+            const o3 = { _meta: { FileMetaInformationVersion: new Uint8Array([0, 1]).buffer, MediaStorageSOPClassUID: this.getElement("SOPClassUID") || n2.SecondaryCaptureImageStorage, MediaStorageSOPInstanceUID: this.getElement("SOPInstanceUID") || y2.generateDerivedUid(), TransferSyntaxUID: this.getTransferSyntaxUid(), ImplementationClassUID: r5.getImplementationClassUid(), ImplementationVersionName: r5.getImplementationVersion() }, ...this.getElements() }, a2 = l2.denaturalizeDataset(o3._meta), u3 = new m3(a2);
             u3.dict = s3 ? l2.denaturalizeDataset(o3, { ...l2.nameMap, ...s3 }) : l2.denaturalizeDataset(o3), t3 instanceof Function ? c3(e3, Buffer.from(u3.write(i4)), (e4) => {
               t3(e4 || void 0);
             }) : d3(e3, Buffer.from(u3.write(i4)));
@@ -37883,17 +37883,17 @@ var require_dcmjs_dimse_min = __commonJS({
           }
           static _fromP10Buffer(e3, t3) {
             t3 = t3 || {}, t3 = { ignoreErrors: true, ...t3 };
-            const s3 = g3.readFile(e3.buffer.slice(e3.byteOffset, e3.byteOffset + e3.byteLength), t3), n3 = l2.naturalizeDataset(s3.meta).TransferSyntaxUID, i4 = l2.naturalizeDataset(s3.dict);
-            return new y(i4, n3);
+            const s3 = g2.readFile(e3.buffer.slice(e3.byteOffset, e3.byteOffset + e3.byteLength), t3), n3 = l2.naturalizeDataset(s3.meta).TransferSyntaxUID, i4 = l2.naturalizeDataset(s3.dict);
+            return new y2(i4, n3);
           }
           _fromElementsBuffer(e3, t3, s3) {
             const n3 = new p3(e3.buffer.slice(e3.byteOffset, e3.byteOffset + e3.byteLength));
             let r6 = t3 === i3.ImplicitVRLittleEndian ? i3.ImplicitVRLittleEndian : i3.ExplicitVRLittleEndian;
-            const o3 = g3._read(n3, r6, s3);
+            const o3 = g2._read(n3, r6, s3);
             return l2.naturalizeDataset(o3);
           }
         }
-        e2.exports = y;
+        e2.exports = y2;
       }, 719: (e2, t2, s2) => {
         const { DefaultImplementation: n2 } = s2(855);
         e2.exports = class {
@@ -37917,8 +37917,8 @@ var require_dcmjs_dimse_min = __commonJS({
           }
         };
       }, 988: (e2, t2, s2) => {
-        const { Association: n2 } = s2(201), { AAbort: i3, AAssociateAC: r5, AAssociateRJ: o2, AAssociateRQ: a, AReleaseRP: c3, AReleaseRQ: d3, PDataTF: u2, Pdv: h3, RawPdu: m3 } = s2(634), { CommandFieldType: g3, Status: l2, TranscodableTransferSyntaxes: p3 } = s2(855), { CCancelRequest: R2, CEchoRequest: f, CEchoResponse: y, CFindRequest: S2, CFindResponse: I2, CGetRequest: C2, CGetResponse: P, CMoveRequest: v3, CMoveResponse: x, Command: w2, CStoreRequest: A2, CStoreResponse: U2, NActionRequest: q2, NActionResponse: D2, NCreateRequest: E3, NCreateResponse: T, NDeleteRequest: O2, NDeleteResponse: b2, NEventReportRequest: N2, NEventReportResponse: B, NGetRequest: M2, NGetResponse: L2, NSetRequest: F, NSetResponse: k2, Response: $2 } = s2(406), j2 = s2(347), V2 = s2(719), G = s2(266), _2 = s2(437), { SmartBuffer: z2 } = s2(677), { EOL: Q } = s2(37), W2 = s2(425);
-        class J extends W2 {
+        const { Association: n2 } = s2(201), { AAbort: i3, AAssociateAC: r5, AAssociateRJ: o2, AAssociateRQ: a, AReleaseRP: c3, AReleaseRQ: d3, PDataTF: u2, Pdv: h3, RawPdu: m3 } = s2(634), { CommandFieldType: g2, Status: l2, TranscodableTransferSyntaxes: p3 } = s2(855), { CCancelRequest: R2, CEchoRequest: f, CEchoResponse: y2, CFindRequest: S2, CFindResponse: I2, CGetRequest: C2, CGetResponse: P2, CMoveRequest: v3, CMoveResponse: x, Command: w2, CStoreRequest: A2, CStoreResponse: U2, NActionRequest: q, NActionResponse: D2, NCreateRequest: E2, NCreateResponse: T, NDeleteRequest: O2, NDeleteResponse: b2, NEventReportRequest: N2, NEventReportResponse: B2, NGetRequest: M2, NGetResponse: L2, NSetRequest: F, NSetResponse: k2, Response: $ } = s2(406), j2 = s2(347), V2 = s2(719), G2 = s2(266), _2 = s2(437), { SmartBuffer: z2 } = s2(677), { EOL: Q2 } = s2(37), W = s2(425);
+        class J2 extends W {
           constructor() {
             super();
           }
@@ -37955,19 +37955,19 @@ var require_dcmjs_dimse_min = __commonJS({
             }
           }
         }
-        e2.exports = class extends W2 {
+        e2.exports = class extends W {
           constructor(e3, t3) {
-            super(), this.messageId = 0, this.socket = e3, this.requests = [], this.pending = [], this.dimseBuffer = void 0, this.dimse = void 0, t3 = t3 || {}, this.connectTimeout = t3.connectTimeout || 18e4, this.associationTimeout = t3.associationTimeout || 6e4, this.pduTimeout = t3.pduTimeout || 6e4, this.logCommandDatasets = t3.logCommandDatasets || false, this.logDatasets = t3.logDatasets || false, this.datasetReadOptions = t3.datasetReadOptions || {}, this.datasetWriteOptions = t3.datasetWriteOptions || {}, this.datasetNameMap = t3.datasetNameMap || {}, this.logId = "", this.connected = false, this.connectedTime = void 0, this.lastPduTime = void 0, this.timeoutIntervalId = void 0, this.statistics = new G(), this._wrapSocket();
+            super(), this.messageId = 0, this.socket = e3, this.requests = [], this.pending = [], this.dimseBuffer = void 0, this.dimse = void 0, t3 = t3 || {}, this.connectTimeout = t3.connectTimeout || 18e4, this.associationTimeout = t3.associationTimeout || 6e4, this.pduTimeout = t3.pduTimeout || 6e4, this.logCommandDatasets = t3.logCommandDatasets || false, this.logDatasets = t3.logDatasets || false, this.datasetReadOptions = t3.datasetReadOptions || {}, this.datasetWriteOptions = t3.datasetWriteOptions || {}, this.datasetNameMap = t3.datasetNameMap || {}, this.logId = "", this.connected = false, this.connectedTime = void 0, this.lastPduTime = void 0, this.timeoutIntervalId = void 0, this.statistics = new G2(), this._wrapSocket();
           }
           sendAssociationRequest(e3) {
             this.association = e3;
             const t3 = new a(this.association).write();
-            this.logId = this.association.getCalledAeTitle(), _2.info(`${this.logId} -> Association request:${Q}${this.association.toString()}`), this._sendPdu(t3);
+            this.logId = this.association.getCalledAeTitle(), _2.info(`${this.logId} -> Association request:${Q2}${this.association.toString()}`), this._sendPdu(t3);
           }
           sendAssociationAccept() {
             this.association.setImplementationClassUid(V2.getImplementationClassUid()), this.association.setImplementationVersion(V2.getImplementationVersion()), this.association.setMaxPduLength(Math.min(this.association.getMaxPduLength(), V2.getMaxPduLength()));
             const e3 = new r5(this.association).write();
-            _2.info(`${this.logId} -> Association accept:${Q}${this.association.toString()}`), this._sendPdu(e3);
+            _2.info(`${this.logId} -> Association accept:${Q2}${this.association.toString()}`), this._sendPdu(e3);
           }
           sendAssociationReject(e3, t3, s3) {
             const n3 = new o2(e3, t3, s3), i4 = n3.write();
@@ -38072,10 +38072,10 @@ var require_dcmjs_dimse_min = __commonJS({
             try {
               switch (t3.readPdu(), t3.getType()) {
                 case 1:
-                  this.association = new n2(), new a(this.association).read(t3), this.logId = this.association.getCallingAeTitle(), _2.info(`${this.logId} <- Association request:${Q}${this.association.toString()}`), this.emit("associationRequested", this.association);
+                  this.association = new n2(), new a(this.association).read(t3), this.logId = this.association.getCallingAeTitle(), _2.info(`${this.logId} <- Association request:${Q2}${this.association.toString()}`), this.emit("associationRequested", this.association);
                   break;
                 case 2:
-                  new r5(this.association).read(t3), this.logId = this.association.getCalledAeTitle(), _2.info(`${this.logId} <- Association accept:${Q}${this.association.toString()}`), this.emit("associationAccepted", this.association);
+                  new r5(this.association).read(t3), this.logId = this.association.getCalledAeTitle(), _2.info(`${this.logId} <- Association accept:${Q2}${this.association.toString()}`), this.emit("associationAccepted", this.association);
                   break;
                 case 3: {
                   const e4 = new o2();
@@ -38116,73 +38116,73 @@ var require_dcmjs_dimse_min = __commonJS({
                   if (e4.isCommand()) {
                     const s3 = new w2(new j2(this.dimseBuffer.toBuffer()));
                     switch (s3.getCommandFieldType()) {
-                      case g3.CEchoRequest:
+                      case g2.CEchoRequest:
                         this.dimse = Object.assign(new f(), s3);
                         break;
-                      case g3.CEchoResponse:
-                        this.dimse = Object.assign(new y(), s3);
+                      case g2.CEchoResponse:
+                        this.dimse = Object.assign(new y2(), s3);
                         break;
-                      case g3.CFindRequest:
+                      case g2.CFindRequest:
                         this.dimse = Object.assign(new S2(), s3);
                         break;
-                      case g3.CFindResponse:
+                      case g2.CFindResponse:
                         this.dimse = Object.assign(new I2(), s3);
                         break;
-                      case g3.CStoreRequest:
+                      case g2.CStoreRequest:
                         this.dimse = Object.assign(new A2(), s3);
                         break;
-                      case g3.CStoreResponse:
+                      case g2.CStoreResponse:
                         this.dimse = Object.assign(new U2(), s3);
                         break;
-                      case g3.CMoveRequest:
+                      case g2.CMoveRequest:
                         this.dimse = Object.assign(new v3(), s3);
                         break;
-                      case g3.CMoveResponse:
+                      case g2.CMoveResponse:
                         this.dimse = Object.assign(new x(), s3);
                         break;
-                      case g3.CGetRequest:
+                      case g2.CGetRequest:
                         this.dimse = Object.assign(new C2(), s3);
                         break;
-                      case g3.CGetResponse:
-                        this.dimse = Object.assign(new P(), s3);
+                      case g2.CGetResponse:
+                        this.dimse = Object.assign(new P2(), s3);
                         break;
-                      case g3.NCreateRequest:
-                        this.dimse = Object.assign(new E3(), s3);
+                      case g2.NCreateRequest:
+                        this.dimse = Object.assign(new E2(), s3);
                         break;
-                      case g3.NCreateResponse:
+                      case g2.NCreateResponse:
                         this.dimse = Object.assign(new T(), s3);
                         break;
-                      case g3.NActionRequest:
-                        this.dimse = Object.assign(new q2(), s3);
+                      case g2.NActionRequest:
+                        this.dimse = Object.assign(new q(), s3);
                         break;
-                      case g3.NActionResponse:
+                      case g2.NActionResponse:
                         this.dimse = Object.assign(new D2(), s3);
                         break;
-                      case g3.NDeleteRequest:
+                      case g2.NDeleteRequest:
                         this.dimse = Object.assign(new O2(), s3);
                         break;
-                      case g3.NDeleteResponse:
+                      case g2.NDeleteResponse:
                         this.dimse = Object.assign(new b2(), s3);
                         break;
-                      case g3.NEventReportRequest:
+                      case g2.NEventReportRequest:
                         this.dimse = Object.assign(new N2(), s3);
                         break;
-                      case g3.NEventReportResponse:
-                        this.dimse = Object.assign(new B(), s3);
+                      case g2.NEventReportResponse:
+                        this.dimse = Object.assign(new B2(), s3);
                         break;
-                      case g3.NGetRequest:
+                      case g2.NGetRequest:
                         this.dimse = Object.assign(new M2(), s3);
                         break;
-                      case g3.NGetResponse:
+                      case g2.NGetResponse:
                         this.dimse = Object.assign(new L2(), s3);
                         break;
-                      case g3.NSetRequest:
+                      case g2.NSetRequest:
                         this.dimse = Object.assign(new F(), s3);
                         break;
-                      case g3.NSetResponse:
+                      case g2.NSetResponse:
                         this.dimse = Object.assign(new k2(), s3);
                         break;
-                      case g3.CCancelRequest:
+                      case g2.CCancelRequest:
                         this.dimse = Object.assign(new R2(), s3);
                         break;
                       default:
@@ -38201,45 +38201,45 @@ var require_dcmjs_dimse_min = __commonJS({
             }
           }
           _performDimse(e3, t3) {
-            if (t3 instanceof $2) {
+            if (t3 instanceof $) {
               const e4 = Object.assign(Object.create(Object.getPrototypeOf(t3)), t3), s3 = this.pending.find((e5) => e5.getMessageId() === t3.getMessageIdBeingRespondedTo());
               s3 && (s3.raiseResponseEvent(e4), e4.getStatus() !== l2.Pending && s3.raiseDoneEvent());
             } else
-              t3.getCommandFieldType() === g3.CEchoRequest ? this.emit("cEchoRequest", t3, (t4) => {
+              t3.getCommandFieldType() === g2.CEchoRequest ? this.emit("cEchoRequest", t3, (t4) => {
                 this._sendDimse({ context: e3, command: t4 });
-              }) : t3.getCommandFieldType() === g3.CFindRequest ? this.emit("cFindRequest", t3, (t4) => {
+              }) : t3.getCommandFieldType() === g2.CFindRequest ? this.emit("cFindRequest", t3, (t4) => {
                 (Array.isArray(t4) ? t4 : [t4]).forEach((t5) => {
                   this._sendDimse({ context: e3, command: t5 });
                 });
-              }) : t3.getCommandFieldType() === g3.CStoreRequest ? this.emit("cStoreRequest", t3, (t4) => {
+              }) : t3.getCommandFieldType() === g2.CStoreRequest ? this.emit("cStoreRequest", t3, (t4) => {
                 this._sendDimse({ context: e3, command: t4 });
-              }) : t3.getCommandFieldType() === g3.CMoveRequest ? this.emit("cMoveRequest", t3, (t4) => {
+              }) : t3.getCommandFieldType() === g2.CMoveRequest ? this.emit("cMoveRequest", t3, (t4) => {
                 (Array.isArray(t4) ? t4 : [t4]).forEach((t5) => {
                   this._sendDimse({ context: e3, command: t5 });
                 });
-              }) : t3.getCommandFieldType() === g3.CGetRequest ? this.emit("cGetRequest", t3, (t4) => {
+              }) : t3.getCommandFieldType() === g2.CGetRequest ? this.emit("cGetRequest", t3, (t4) => {
                 (Array.isArray(t4) ? t4 : [t4]).forEach((t5) => {
                   this._sendDimse({ context: e3, command: t5 });
                 });
-              }) : t3.getCommandFieldType() === g3.NCreateRequest ? this.emit("nCreateRequest", t3, (t4) => {
+              }) : t3.getCommandFieldType() === g2.NCreateRequest ? this.emit("nCreateRequest", t3, (t4) => {
                 this._sendDimse({ context: e3, command: t4 });
-              }) : t3.getCommandFieldType() === g3.NActionRequest ? this.emit("nActionRequest", t3, (t4) => {
+              }) : t3.getCommandFieldType() === g2.NActionRequest ? this.emit("nActionRequest", t3, (t4) => {
                 this._sendDimse({ context: e3, command: t4 });
-              }) : t3.getCommandFieldType() === g3.NDeleteRequest ? this.emit("nDeleteRequest", t3, (t4) => {
+              }) : t3.getCommandFieldType() === g2.NDeleteRequest ? this.emit("nDeleteRequest", t3, (t4) => {
                 this._sendDimse({ context: e3, command: t4 });
-              }) : t3.getCommandFieldType() === g3.NEventReportRequest ? this.emit("nEventReportRequest", t3, (t4) => {
+              }) : t3.getCommandFieldType() === g2.NEventReportRequest ? this.emit("nEventReportRequest", t3, (t4) => {
                 this._sendDimse({ context: e3, command: t4 });
-              }) : t3.getCommandFieldType() === g3.NGetRequest ? this.emit("nGetRequest", t3, (t4) => {
+              }) : t3.getCommandFieldType() === g2.NGetRequest ? this.emit("nGetRequest", t3, (t4) => {
                 this._sendDimse({ context: e3, command: t4 });
-              }) : t3.getCommandFieldType() === g3.NSetRequest ? this.emit("nSetRequest", t3, (t4) => {
+              }) : t3.getCommandFieldType() === g2.NSetRequest ? this.emit("nSetRequest", t3, (t4) => {
                 this._sendDimse({ context: e3, command: t4 });
-              }) : t3.getCommandFieldType() === g3.CCancelRequest && this.emit("cCancelRequest", t3);
+              }) : t3.getCommandFieldType() === g2.CCancelRequest && this.emit("cCancelRequest", t3);
           }
           _wrapSocket() {
             this.socket.setTimeout(this.connectTimeout), this.socket.on("connect", () => {
               this.connected = true, this.connectedTime = Date.now(), this.emit("connect");
             });
-            const e3 = new J();
+            const e3 = new J2();
             e3.on("pdu", (e4) => {
               this.lastPduTime = Date.now(), this._processPdu(e4);
             }), this.socket.on("data", (t3) => {
@@ -38716,7 +38716,7 @@ var require_dcmjs_dimse_min = __commonJS({
           }
         }, Pdv: m3, RawPdu: h3 };
       }, 975: (e2, t2, s2) => {
-        const { CEchoResponse: n2, CFindResponse: i3, CGetResponse: r5, CMoveResponse: o2, CStoreResponse: a, NActionResponse: c3, NCreateResponse: d3, NDeleteResponse: u2, NEventReportResponse: h3, NGetResponse: m3, NSetResponse: g3 } = s2(406), l2 = s2(988), p3 = s2(266), R2 = s2(437), f = s2(425), y = s2(808), S2 = s2(404);
+        const { CEchoResponse: n2, CFindResponse: i3, CGetResponse: r5, CMoveResponse: o2, CStoreResponse: a, NActionResponse: c3, NCreateResponse: d3, NDeleteResponse: u2, NEventReportResponse: h3, NGetResponse: m3, NSetResponse: g2 } = s2(406), l2 = s2(988), p3 = s2(266), R2 = s2(437), f = s2(425), y2 = s2(808), S2 = s2(404);
         e2.exports = { Scp: class extends l2 {
           constructor(e3, t3) {
             super(e3, t3), this.on("associationRequested", (e4) => {
@@ -38788,7 +38788,7 @@ var require_dcmjs_dimse_min = __commonJS({
             R2.error("nGetRequest method must be implemented"), t3(m3.fromRequest(e3));
           }
           nSetRequest(e3, t3) {
-            R2.error("nSetRequest method must be implemented"), t3(g3.fromRequest(e3));
+            R2.error("nSetRequest method must be implemented"), t3(g2.fromRequest(e3));
           }
           cCancelRequest(e3) {
             R2.error("cCancelRequest method must be implemented");
@@ -38803,7 +38803,7 @@ var require_dcmjs_dimse_min = __commonJS({
           listen(e3, t3) {
             let s3 = {};
             (t3 = t3 || {}).securityOptions && (s3 = { key: t3.securityOptions.key, cert: t3.securityOptions.cert, ca: t3.securityOptions.ca, requestCert: t3.securityOptions.requestCert, rejectUnauthorized: t3.securityOptions.rejectUnauthorized, minVersion: t3.securityOptions.minVersion, maxVersion: t3.securityOptions.maxVersion, ciphers: t3.securityOptions.ciphers, SNICallback: t3.securityOptions.SNICallback });
-            const n3 = t3.securityOptions ? S2 : y;
+            const n3 = t3.securityOptions ? S2 : y2;
             this.server = n3.createServer(s3, (e4) => {
               R2.info(`Client connecting from ${e4.remoteAddress}:${e4.remotePort} ${t3.securityOptions ? e4.authorized ? "(Authorized)" : "(Unauthorized)" : ""}`);
               const s4 = new this.scp.class(e4, t3);
@@ -38858,8 +38858,8 @@ var require_dcmjs_dimse_min = __commonJS({
           }
         };
       }, 10: (e2, t2, s2) => {
-        const { Association: n2, PresentationContext: i3 } = s2(201), { Scp: r5, Server: o2 } = s2(975), { CCancelRequest: a, CEchoRequest: c3, CEchoResponse: d3, CFindRequest: u2, CFindResponse: h3, CGetRequest: m3, CGetResponse: g3, CMoveRequest: l2, CMoveResponse: p3, CStoreRequest: R2, CStoreResponse: f, NActionRequest: y, NActionResponse: S2, NCreateRequest: I2, NCreateResponse: C2, NDeleteRequest: P, NDeleteResponse: v3, NEventReportRequest: x, NEventReportResponse: w2, NGetRequest: A2, NGetResponse: U2, NSetRequest: q2, NSetResponse: D2 } = s2(406), { AbortReason: E3, AbortSource: T, CommandFieldType: O2, PresentationContextResult: b2, Priority: N2, RejectReason: B, RejectResult: M2, RejectSource: L2, SopClass: F, Status: k2, StorageClass: $2, TransferSyntax: j2, Uid: V2, UserIdentityType: G } = s2(855), _2 = s2(185), z2 = s2(347), Q = s2(719), W2 = s2(266), J = { association: { Association: n2, PresentationContext: i3 }, Client: _2, constants: { AbortReason: E3, AbortSource: T, CommandFieldType: O2, PresentationContextResult: b2, Priority: N2, RejectReason: B, RejectResult: M2, RejectSource: L2, SopClass: F, Status: k2, StorageClass: $2, TransferSyntax: j2, Uid: V2, UserIdentityType: G }, Dataset: z2, Implementation: Q, log: s2(437), requests: { CCancelRequest: a, CEchoRequest: c3, CFindRequest: u2, CGetRequest: m3, CMoveRequest: l2, CStoreRequest: R2, NActionRequest: y, NCreateRequest: I2, NDeleteRequest: P, NEventReportRequest: x, NGetRequest: A2, NSetRequest: q2 }, responses: { CEchoResponse: d3, CFindResponse: h3, CGetResponse: g3, CMoveResponse: p3, CStoreResponse: f, NActionResponse: S2, NCreateResponse: C2, NDeleteResponse: v3, NEventReportResponse: w2, NGetResponse: U2, NSetResponse: D2 }, Scp: r5, Server: o2, Statistics: W2, version: s2(972) };
-        e2.exports = J;
+        const { Association: n2, PresentationContext: i3 } = s2(201), { Scp: r5, Server: o2 } = s2(975), { CCancelRequest: a, CEchoRequest: c3, CEchoResponse: d3, CFindRequest: u2, CFindResponse: h3, CGetRequest: m3, CGetResponse: g2, CMoveRequest: l2, CMoveResponse: p3, CStoreRequest: R2, CStoreResponse: f, NActionRequest: y2, NActionResponse: S2, NCreateRequest: I2, NCreateResponse: C2, NDeleteRequest: P2, NDeleteResponse: v3, NEventReportRequest: x, NEventReportResponse: w2, NGetRequest: A2, NGetResponse: U2, NSetRequest: q, NSetResponse: D2 } = s2(406), { AbortReason: E2, AbortSource: T, CommandFieldType: O2, PresentationContextResult: b2, Priority: N2, RejectReason: B2, RejectResult: M2, RejectSource: L2, SopClass: F, Status: k2, StorageClass: $, TransferSyntax: j2, Uid: V2, UserIdentityType: G2 } = s2(855), _2 = s2(185), z2 = s2(347), Q2 = s2(719), W = s2(266), J2 = { association: { Association: n2, PresentationContext: i3 }, Client: _2, constants: { AbortReason: E2, AbortSource: T, CommandFieldType: O2, PresentationContextResult: b2, Priority: N2, RejectReason: B2, RejectResult: M2, RejectSource: L2, SopClass: F, Status: k2, StorageClass: $, TransferSyntax: j2, Uid: V2, UserIdentityType: G2 }, Dataset: z2, Implementation: Q2, log: s2(437), requests: { CCancelRequest: a, CEchoRequest: c3, CFindRequest: u2, CGetRequest: m3, CMoveRequest: l2, CStoreRequest: R2, NActionRequest: y2, NCreateRequest: I2, NDeleteRequest: P2, NEventReportRequest: x, NGetRequest: A2, NSetRequest: q }, responses: { CEchoResponse: d3, CFindResponse: h3, CGetResponse: g2, CMoveResponse: p3, CStoreResponse: f, NActionResponse: S2, NCreateResponse: C2, NDeleteResponse: v3, NEventReportResponse: w2, NGetResponse: U2, NSetResponse: D2 }, Scp: r5, Server: o2, Statistics: W, version: s2(972) };
+        e2.exports = J2;
       }, 437: (e2, t2, s2) => {
         const { createLogger: n2, format: i3, transports: r5 } = s2(469), { combine: o2, printf: a, timestamp: c3 } = i3, d3 = n2({ format: o2(c3(), a(({ level: e3, message: t3, timestamp: s3 }) => `${s3} -- ${e3.toUpperCase()} -- ${t3}`)), transports: [new r5.Console()] });
         e2.exports = d3;
@@ -38912,7 +38912,7 @@ __export(main_exports, {
 module.exports = __toCommonJS(main_exports);
 
 // ../core/dist/esm/index.mjs
-var Ee = class {
+var Re = class {
   constructor(e, t) {
     this.operator = e;
     this.child = t;
@@ -38921,7 +38921,7 @@ var Ee = class {
     return `${this.operator}(${this.child.toString()})`;
   }
 };
-var j = class {
+var Q = class {
   constructor(e, t, n) {
     this.operator = e;
     this.left = t;
@@ -38931,7 +38931,7 @@ var j = class {
     return `${this.left.toString()} ${this.operator} ${this.right.toString()}`;
   }
 };
-var be = class {
+var Pe = class {
   constructor() {
     this.prefixParselets = {};
     this.infixParselets = {};
@@ -38955,10 +38955,10 @@ var be = class {
     }, precedence: t });
   }
   construct(e) {
-    return new at(e, this.prefixParselets, this.infixParselets);
+    return new ut(e, this.prefixParselets, this.infixParselets);
   }
 };
-var at = class {
+var ut = class {
   constructor(e, t, n) {
     this.tokens = e, this.prefixParselets = t, this.infixParselets = n;
   }
@@ -39009,139 +39009,177 @@ var at = class {
     return this.infixParselets[e.id === "Symbol" ? e.value : e.id];
   }
 };
-function z(r4) {
-  let e = de(r4), t = On(r4);
+var lt = "ok";
+var Ce = "created";
+var pt = "not-modified";
+var ft = "not-found";
+var Ae = "accepted";
+var ir = { resourceType: "OperationOutcome", id: ft, issue: [{ severity: "error", code: "not-found", details: { text: "Not found" } }] };
+function v(r4, e) {
+  return { resourceType: "OperationOutcome", issue: [{ severity: "error", code: "invalid", details: { text: r4 }, expression: e ? [e] : void 0 }] };
+}
+function h(r4) {
+  return { resourceType: "OperationOutcome", issue: [{ severity: "error", code: "structure", details: { text: r4 } }] };
+}
+function ne(r4) {
+  return typeof r4 == "object" && r4 !== null && r4.resourceType === "OperationOutcome";
+}
+function mt(r4) {
+  return r4.id === lt || r4.id === Ce || r4.id === pt || r4.id === Ae;
+}
+var d = class extends Error {
+  constructor(t, n) {
+    super(or(t));
+    this.outcome = t, this.cause = n;
+  }
+};
+function we(r4) {
+  return r4 instanceof d ? r4.outcome : ne(r4) ? r4 : v(Nn(r4));
+}
+function Nn(r4) {
+  return r4 ? typeof r4 == "string" ? r4 : r4 instanceof Error ? r4.message : ne(r4) ? or(r4) : typeof r4 == "object" && "code" in r4 && typeof r4.code == "string" ? r4.code : JSON.stringify(r4) : "Unknown error";
+}
+function or(r4) {
+  let e = r4.issue?.map(Fn) ?? [];
+  return e.length > 0 ? e.join("; ") : "Unknown error";
+}
+function Fn(r4) {
+  let e;
+  return r4.details?.text ? r4.diagnostics ? e = `${r4.details.text} (${r4.diagnostics})` : e = r4.details.text : r4.diagnostics ? e = r4.diagnostics : e = "Unknown error", r4.expression?.length && (e += ` (${r4.expression.join(", ")})`), e;
+}
+function J(r4) {
+  let e = pe(r4), t = _n(r4);
   return t === e ? { reference: e } : { reference: e, display: t };
 }
-function de(r4) {
-  return pe(r4) ? r4.reference : `${r4.resourceType}/${r4.id}`;
+function pe(r4) {
+  return fe(r4) ? r4.reference : `${r4.resourceType}/${r4.id}`;
 }
-function tr(r4) {
+function ur(r4) {
   if (r4)
-    return pe(r4) ? r4.reference.split("/")[1] : r4.id;
+    return fe(r4) ? r4.reference.split("/")[1] : r4.id;
 }
-function kn(r4) {
+function Mn(r4) {
   return r4.resourceType === "Patient" || r4.resourceType === "Practitioner" || r4.resourceType === "RelatedPerson";
 }
-function On(r4) {
-  if (kn(r4)) {
-    let e = Vn(r4);
+function _n(r4) {
+  if (Mn(r4)) {
+    let e = Ln(r4);
     if (e)
       return e;
   }
   if (r4.resourceType === "Device") {
-    let e = Dn(r4);
+    let e = Un(r4);
     if (e)
       return e;
   }
-  return r4.resourceType === "Observation" && "code" in r4 && r4.code?.text ? r4.code.text : r4.resourceType === "User" && r4.email ? r4.email : "name" in r4 && r4.name && typeof r4.name == "string" ? r4.name : de(r4);
+  return r4.resourceType === "Observation" && "code" in r4 && r4.code?.text ? r4.code.text : r4.resourceType === "User" && r4.email ? r4.email : "name" in r4 && r4.name && typeof r4.name == "string" ? r4.name : pe(r4);
 }
-function Vn(r4) {
+function Ln(r4) {
   let e = r4.name;
   if (e && e.length > 0)
-    return Ie(e[0]);
+    return Ne(e[0]);
 }
-function Dn(r4) {
+function Un(r4) {
   let e = r4.deviceName;
   if (e && e.length > 0)
     return e[0].name;
 }
-function Re(r4, e) {
+function Ie(r4, e) {
   let t = new Date(r4);
   t.setUTCHours(0, 0, 0, 0);
   let n = e ? new Date(e) : /* @__PURE__ */ new Date();
   n.setUTCHours(0, 0, 0, 0);
   let i2 = t.getUTCFullYear(), o = t.getUTCMonth(), s = t.getUTCDate(), a = n.getUTCFullYear(), u2 = n.getUTCMonth(), l2 = n.getUTCDate(), f = a - i2;
   (u2 < o || u2 === o && l2 < s) && f--;
-  let P = a * 12 + u2 - (i2 * 12 + o);
-  l2 < s && P--;
-  let B = Math.floor((n.getTime() - t.getTime()) / (1e3 * 60 * 60 * 24));
-  return { years: f, months: P, days: B };
+  let E2 = a * 12 + u2 - (i2 * 12 + o);
+  l2 < s && E2--;
+  let q = Math.floor((n.getTime() - t.getTime()) / (1e3 * 60 * 60 * 24));
+  return { years: f, months: E2, days: q };
 }
-function ir(r4, ...e) {
+function pr(r4, ...e) {
   let t = r4;
   for (let n = 0; n < e.length && t; n++)
     t = t?.extension?.find((i2) => i2.url === e[n]);
   return t;
 }
-function or(r4, e) {
-  return JSON.stringify(r4, Nn, e ? 2 : void 0);
+function fr(r4, e) {
+  return JSON.stringify(r4, Bn, e ? 2 : void 0);
 }
-function Nn(r4, e) {
-  return !Fn(r4) && E(e) ? void 0 : e;
+function Bn(r4, e) {
+  return !qn(r4) && R(e) ? void 0 : e;
 }
-function Fn(r4) {
+function qn(r4) {
   return !!/\d+$/.exec(r4);
 }
-function E(r4) {
+function R(r4) {
   if (r4 == null)
     return true;
   let e = typeof r4;
-  return e === "string" || e === "object" ? !_n(r4) : false;
+  return e === "string" || e === "object" ? !jn(r4) : false;
 }
-function _n(r4) {
+function jn(r4) {
   if (r4 == null)
     return false;
   let e = typeof r4;
   return e === "string" && r4 !== "" || e === "object" && ("length" in r4 && r4.length > 0 || Object.keys(r4).length > 0);
 }
-function sr(r4) {
+function mr(r4) {
   return r4.every((e) => typeof e == "string");
 }
-var ar = [];
+var hr = [];
 for (let r4 = 0; r4 < 256; r4++)
-  ar.push(r4.toString(16).padStart(2, "0"));
-function cr(r4) {
+  hr.push(r4.toString(16).padStart(2, "0"));
+function gr(r4) {
   let e = new Uint8Array(r4), t = new Array(e.length);
   for (let n = 0; n < e.length; n++)
-    t[n] = ar[e[n]];
+    t[n] = hr[e[n]];
   return t.join("");
 }
-function ur(r4) {
+function yr(r4) {
   let e = new Uint8Array(r4), t = [];
   for (let n = 0; n < e.length; n++)
     t[n] = String.fromCharCode(e[n]);
   return window.btoa(t.join(""));
 }
-function w(r4) {
+function I(r4) {
   return r4 ? r4.charAt(0).toUpperCase() + r4.substring(1) : "";
 }
-var lt = (r4) => new Promise((e) => {
+var xt = (r4) => new Promise((e) => {
   setTimeout(e, r4);
 });
-function Ie(r4, e) {
+function Ne(r4, e) {
   let t = [];
   if (r4.prefix && e?.prefix !== false && t.push(...r4.prefix), r4.given && t.push(...r4.given), r4.family && t.push(r4.family), r4.suffix && e?.suffix !== false && t.push(...r4.suffix), r4.use && (e?.all || e?.use) && t.push("[" + r4.use + "]"), t.length === 0) {
-    let n = re(r4.text);
+    let n = ie(r4.text);
     if (n)
       return n;
   }
   return t.join(" ").trim();
 }
-function re(r4) {
+function ie(r4) {
   return typeof r4 == "string" ? r4 : void 0;
 }
-function ni(r4, e) {
+function ui(r4, e) {
   let t = e.max && e.max === Number.MAX_SAFE_INTEGER ? Number.POSITIVE_INFINITY : e.max;
   return { path: r4, description: "", type: e.type ?? [], min: e.min ?? 0, max: t ?? 1, isArray: !!t && t > 1, constraints: [] };
 }
-function fr(r4) {
+function Sr(r4) {
   let e = /* @__PURE__ */ Object.create(null);
   for (let [t, n] of Object.entries(r4))
-    e[t] = { name: t, elements: Object.fromEntries(Object.entries(n.elements).map(([i2, o]) => [i2, ni(i2, o)])), constraints: [], innerTypes: [] };
+    e[t] = { name: t, elements: Object.fromEntries(Object.entries(n.elements).map(([i2, o]) => [i2, ui(i2, o)])), constraints: [], innerTypes: [] };
   return e;
 }
-var mr = { Element: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] } } }, BackboneElement: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, modifierExtension: { max: 9007199254740991, type: [{ code: "Extension" }] } } }, Address: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, use: { type: [{ code: "code" }] }, type: { type: [{ code: "code" }] }, text: { type: [{ code: "string" }] }, line: { max: 9007199254740991, type: [{ code: "string" }] }, city: { type: [{ code: "string" }] }, district: { type: [{ code: "string" }] }, state: { type: [{ code: "string" }] }, postalCode: { type: [{ code: "string" }] }, country: { type: [{ code: "string" }] }, period: { type: [{ code: "Period" }] } } }, Age: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, value: { type: [{ code: "decimal" }] }, comparator: { type: [{ code: "code" }] }, unit: { type: [{ code: "string" }] }, system: { type: [{ code: "uri" }] }, code: { type: [{ code: "code" }] } } }, Annotation: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, "author[x]": { type: [{ code: "Reference", targetProfile: ["http://hl7.org/fhir/StructureDefinition/Practitioner", "http://hl7.org/fhir/StructureDefinition/Patient", "http://hl7.org/fhir/StructureDefinition/RelatedPerson", "http://hl7.org/fhir/StructureDefinition/Organization"] }, { code: "string" }] }, time: { type: [{ code: "dateTime" }] }, text: { min: 1, type: [{ code: "markdown" }] } } }, Attachment: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, contentType: { type: [{ code: "code" }] }, language: { type: [{ code: "code" }] }, data: { type: [{ code: "base64Binary" }] }, url: { type: [{ code: "url" }] }, size: { type: [{ code: "unsignedInt" }] }, hash: { type: [{ code: "base64Binary" }] }, title: { type: [{ code: "string" }] }, creation: { type: [{ code: "dateTime" }] } } }, CodeableConcept: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, coding: { max: 9007199254740991, type: [{ code: "Coding" }] }, text: { type: [{ code: "string" }] } } }, Coding: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, system: { type: [{ code: "uri" }] }, version: { type: [{ code: "string" }] }, code: { type: [{ code: "code" }] }, display: { type: [{ code: "string" }] }, userSelected: { type: [{ code: "boolean" }] } } }, ContactDetail: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, name: { type: [{ code: "string" }] }, telecom: { max: 9007199254740991, type: [{ code: "ContactPoint" }] } } }, ContactPoint: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, system: { type: [{ code: "code" }] }, value: { type: [{ code: "string" }] }, use: { type: [{ code: "code" }] }, rank: { type: [{ code: "positiveInt" }] }, period: { type: [{ code: "Period" }] } } }, Contributor: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, type: { min: 1, type: [{ code: "code" }] }, name: { min: 1, type: [{ code: "string" }] }, contact: { max: 9007199254740991, type: [{ code: "ContactDetail" }] } } }, Count: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, value: { type: [{ code: "decimal" }] }, comparator: { type: [{ code: "code" }] }, unit: { type: [{ code: "string" }] }, system: { type: [{ code: "uri" }] }, code: { type: [{ code: "code" }] } } }, DataRequirement: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, type: { min: 1, type: [{ code: "code" }] }, profile: { max: 9007199254740991, type: [{ code: "canonical", targetProfile: ["http://hl7.org/fhir/StructureDefinition/StructureDefinition"] }] }, "subject[x]": { type: [{ code: "CodeableConcept" }, { code: "Reference", targetProfile: ["http://hl7.org/fhir/StructureDefinition/Group"] }] }, mustSupport: { max: 9007199254740991, type: [{ code: "string" }] }, codeFilter: { max: 9007199254740991, type: [{ code: "DataRequirementCodeFilter" }] }, dateFilter: { max: 9007199254740991, type: [{ code: "DataRequirementDateFilter" }] }, limit: { type: [{ code: "positiveInt" }] }, sort: { max: 9007199254740991, type: [{ code: "DataRequirementSort" }] } } }, Distance: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, value: { type: [{ code: "decimal" }] }, comparator: { type: [{ code: "code" }] }, unit: { type: [{ code: "string" }] }, system: { type: [{ code: "uri" }] }, code: { type: [{ code: "code" }] } } }, Dosage: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, modifierExtension: { max: 9007199254740991, type: [{ code: "Extension" }] }, sequence: { type: [{ code: "integer" }] }, text: { type: [{ code: "string" }] }, additionalInstruction: { max: 9007199254740991, type: [{ code: "CodeableConcept" }] }, patientInstruction: { type: [{ code: "string" }] }, timing: { type: [{ code: "Timing" }] }, "asNeeded[x]": { type: [{ code: "boolean" }, { code: "CodeableConcept" }] }, site: { type: [{ code: "CodeableConcept" }] }, route: { type: [{ code: "CodeableConcept" }] }, method: { type: [{ code: "CodeableConcept" }] }, doseAndRate: { max: 9007199254740991, type: [{ code: "DosageDoseAndRate" }] }, maxDosePerPeriod: { type: [{ code: "Ratio" }] }, maxDosePerAdministration: { type: [{ code: "Quantity" }] }, maxDosePerLifetime: { type: [{ code: "Quantity" }] } } }, Duration: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, value: { type: [{ code: "decimal" }] }, comparator: { type: [{ code: "code" }] }, unit: { type: [{ code: "string" }] }, system: { type: [{ code: "uri" }] }, code: { type: [{ code: "code" }] } } }, ElementDefinition: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, modifierExtension: { max: 9007199254740991, type: [{ code: "Extension" }] }, path: { min: 1, type: [{ code: "string" }] }, representation: { max: 9007199254740991, type: [{ code: "code" }] }, sliceName: { type: [{ code: "string" }] }, sliceIsConstraining: { type: [{ code: "boolean" }] }, label: { type: [{ code: "string" }] }, code: { max: 9007199254740991, type: [{ code: "Coding" }] }, slicing: { type: [{ code: "ElementDefinitionSlicing" }] }, short: { type: [{ code: "string" }] }, definition: { type: [{ code: "markdown" }] }, comment: { type: [{ code: "markdown" }] }, requirements: { type: [{ code: "markdown" }] }, alias: { max: 9007199254740991, type: [{ code: "string" }] }, min: { type: [{ code: "unsignedInt" }] }, max: { type: [{ code: "string" }] }, base: { type: [{ code: "ElementDefinitionBase" }] }, contentReference: { type: [{ code: "uri" }] }, type: { max: 9007199254740991, type: [{ code: "ElementDefinitionType" }] }, "defaultValue[x]": { type: [{ code: "base64Binary" }, { code: "boolean" }, { code: "canonical" }, { code: "code" }, { code: "date" }, { code: "dateTime" }, { code: "decimal" }, { code: "id" }, { code: "instant" }, { code: "integer" }, { code: "markdown" }, { code: "oid" }, { code: "positiveInt" }, { code: "string" }, { code: "time" }, { code: "unsignedInt" }, { code: "uri" }, { code: "url" }, { code: "uuid" }, { code: "Address" }, { code: "Age" }, { code: "Annotation" }, { code: "Attachment" }, { code: "CodeableConcept" }, { code: "Coding" }, { code: "ContactPoint" }, { code: "Count" }, { code: "Distance" }, { code: "Duration" }, { code: "HumanName" }, { code: "Identifier" }, { code: "Money" }, { code: "Period" }, { code: "Quantity" }, { code: "Range" }, { code: "Ratio" }, { code: "Reference" }, { code: "SampledData" }, { code: "Signature" }, { code: "Timing" }, { code: "ContactDetail" }, { code: "Contributor" }, { code: "DataRequirement" }, { code: "Expression" }, { code: "ParameterDefinition" }, { code: "RelatedArtifact" }, { code: "TriggerDefinition" }, { code: "UsageContext" }, { code: "Dosage" }, { code: "Meta" }] }, meaningWhenMissing: { type: [{ code: "markdown" }] }, orderMeaning: { type: [{ code: "string" }] }, "fixed[x]": { type: [{ code: "base64Binary" }, { code: "boolean" }, { code: "canonical" }, { code: "code" }, { code: "date" }, { code: "dateTime" }, { code: "decimal" }, { code: "id" }, { code: "instant" }, { code: "integer" }, { code: "markdown" }, { code: "oid" }, { code: "positiveInt" }, { code: "string" }, { code: "time" }, { code: "unsignedInt" }, { code: "uri" }, { code: "url" }, { code: "uuid" }, { code: "Address" }, { code: "Age" }, { code: "Annotation" }, { code: "Attachment" }, { code: "CodeableConcept" }, { code: "Coding" }, { code: "ContactPoint" }, { code: "Count" }, { code: "Distance" }, { code: "Duration" }, { code: "HumanName" }, { code: "Identifier" }, { code: "Money" }, { code: "Period" }, { code: "Quantity" }, { code: "Range" }, { code: "Ratio" }, { code: "Reference" }, { code: "SampledData" }, { code: "Signature" }, { code: "Timing" }, { code: "ContactDetail" }, { code: "Contributor" }, { code: "DataRequirement" }, { code: "Expression" }, { code: "ParameterDefinition" }, { code: "RelatedArtifact" }, { code: "TriggerDefinition" }, { code: "UsageContext" }, { code: "Dosage" }, { code: "Meta" }] }, "pattern[x]": { type: [{ code: "base64Binary" }, { code: "boolean" }, { code: "canonical" }, { code: "code" }, { code: "date" }, { code: "dateTime" }, { code: "decimal" }, { code: "id" }, { code: "instant" }, { code: "integer" }, { code: "markdown" }, { code: "oid" }, { code: "positiveInt" }, { code: "string" }, { code: "time" }, { code: "unsignedInt" }, { code: "uri" }, { code: "url" }, { code: "uuid" }, { code: "Address" }, { code: "Age" }, { code: "Annotation" }, { code: "Attachment" }, { code: "CodeableConcept" }, { code: "Coding" }, { code: "ContactPoint" }, { code: "Count" }, { code: "Distance" }, { code: "Duration" }, { code: "HumanName" }, { code: "Identifier" }, { code: "Money" }, { code: "Period" }, { code: "Quantity" }, { code: "Range" }, { code: "Ratio" }, { code: "Reference" }, { code: "SampledData" }, { code: "Signature" }, { code: "Timing" }, { code: "ContactDetail" }, { code: "Contributor" }, { code: "DataRequirement" }, { code: "Expression" }, { code: "ParameterDefinition" }, { code: "RelatedArtifact" }, { code: "TriggerDefinition" }, { code: "UsageContext" }, { code: "Dosage" }, { code: "Meta" }] }, example: { max: 9007199254740991, type: [{ code: "ElementDefinitionExample" }] }, "minValue[x]": { type: [{ code: "date" }, { code: "dateTime" }, { code: "instant" }, { code: "time" }, { code: "decimal" }, { code: "integer" }, { code: "positiveInt" }, { code: "unsignedInt" }, { code: "Quantity" }] }, "maxValue[x]": { type: [{ code: "date" }, { code: "dateTime" }, { code: "instant" }, { code: "time" }, { code: "decimal" }, { code: "integer" }, { code: "positiveInt" }, { code: "unsignedInt" }, { code: "Quantity" }] }, maxLength: { type: [{ code: "integer" }] }, condition: { max: 9007199254740991, type: [{ code: "id" }] }, constraint: { max: 9007199254740991, type: [{ code: "ElementDefinitionConstraint" }] }, mustSupport: { type: [{ code: "boolean" }] }, isModifier: { type: [{ code: "boolean" }] }, isModifierReason: { type: [{ code: "string" }] }, isSummary: { type: [{ code: "boolean" }] }, binding: { type: [{ code: "ElementDefinitionBinding" }] }, mapping: { max: 9007199254740991, type: [{ code: "ElementDefinitionMapping" }] } } }, Expression: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, description: { type: [{ code: "string" }] }, name: { type: [{ code: "id" }] }, language: { min: 1, type: [{ code: "code" }] }, expression: { type: [{ code: "string" }] }, reference: { type: [{ code: "uri" }] } } }, Extension: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, url: { min: 1, type: [{ code: "string" }] }, "value[x]": { type: [{ code: "base64Binary" }, { code: "boolean" }, { code: "canonical" }, { code: "code" }, { code: "date" }, { code: "dateTime" }, { code: "decimal" }, { code: "id" }, { code: "instant" }, { code: "integer" }, { code: "markdown" }, { code: "oid" }, { code: "positiveInt" }, { code: "string" }, { code: "time" }, { code: "unsignedInt" }, { code: "uri" }, { code: "url" }, { code: "uuid" }, { code: "Address" }, { code: "Age" }, { code: "Annotation" }, { code: "Attachment" }, { code: "CodeableConcept" }, { code: "Coding" }, { code: "ContactPoint" }, { code: "Count" }, { code: "Distance" }, { code: "Duration" }, { code: "HumanName" }, { code: "Identifier" }, { code: "Money" }, { code: "Period" }, { code: "Quantity" }, { code: "Range" }, { code: "Ratio" }, { code: "Reference" }, { code: "SampledData" }, { code: "Signature" }, { code: "Timing" }, { code: "ContactDetail" }, { code: "Contributor" }, { code: "DataRequirement" }, { code: "Expression" }, { code: "ParameterDefinition" }, { code: "RelatedArtifact" }, { code: "TriggerDefinition" }, { code: "UsageContext" }, { code: "Dosage" }, { code: "Meta" }] } } }, HumanName: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, use: { type: [{ code: "code" }] }, text: { type: [{ code: "string" }] }, family: { type: [{ code: "string" }] }, given: { max: 9007199254740991, type: [{ code: "string" }] }, prefix: { max: 9007199254740991, type: [{ code: "string" }] }, suffix: { max: 9007199254740991, type: [{ code: "string" }] }, period: { type: [{ code: "Period" }] } } }, Identifier: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, use: { type: [{ code: "code" }] }, type: { type: [{ code: "CodeableConcept" }] }, system: { type: [{ code: "uri" }] }, value: { type: [{ code: "string" }] }, period: { type: [{ code: "Period" }] }, assigner: { type: [{ code: "Reference", targetProfile: ["http://hl7.org/fhir/StructureDefinition/Organization"] }] } } }, MarketingStatus: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, modifierExtension: { max: 9007199254740991, type: [{ code: "Extension" }] }, country: { min: 1, type: [{ code: "CodeableConcept" }] }, jurisdiction: { type: [{ code: "CodeableConcept" }] }, status: { min: 1, type: [{ code: "CodeableConcept" }] }, dateRange: { min: 1, type: [{ code: "Period" }] }, restoreDate: { type: [{ code: "dateTime" }] } } }, Meta: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, versionId: { type: [{ code: "id" }] }, lastUpdated: { type: [{ code: "instant" }] }, source: { type: [{ code: "uri" }] }, profile: { max: 9007199254740991, type: [{ code: "canonical", targetProfile: ["http://hl7.org/fhir/StructureDefinition/StructureDefinition"] }] }, security: { max: 9007199254740991, type: [{ code: "Coding" }] }, tag: { max: 9007199254740991, type: [{ code: "Coding" }] }, project: { type: [{ code: "uri" }] }, author: { type: [{ code: "Reference" }] }, account: { type: [{ code: "Reference" }] }, compartment: { max: 9007199254740991, type: [{ code: "Reference" }] } } }, Money: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, value: { type: [{ code: "decimal" }] }, currency: { type: [{ code: "code" }] } } }, Narrative: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, status: { min: 1, type: [{ code: "code" }] }, div: { min: 1, type: [{ code: "xhtml" }] } } }, ParameterDefinition: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, name: { type: [{ code: "code" }] }, use: { min: 1, type: [{ code: "code" }] }, min: { type: [{ code: "integer" }] }, max: { type: [{ code: "string" }] }, documentation: { type: [{ code: "string" }] }, type: { min: 1, type: [{ code: "code" }] }, profile: { type: [{ code: "canonical", targetProfile: ["http://hl7.org/fhir/StructureDefinition/StructureDefinition"] }] } } }, Period: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, start: { type: [{ code: "dateTime" }] }, end: { type: [{ code: "dateTime" }] } } }, Population: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, modifierExtension: { max: 9007199254740991, type: [{ code: "Extension" }] }, "age[x]": { type: [{ code: "Range" }, { code: "CodeableConcept" }] }, gender: { type: [{ code: "CodeableConcept" }] }, race: { type: [{ code: "CodeableConcept" }] }, physiologicalCondition: { type: [{ code: "CodeableConcept" }] } } }, ProdCharacteristic: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, modifierExtension: { max: 9007199254740991, type: [{ code: "Extension" }] }, height: { type: [{ code: "Quantity" }] }, width: { type: [{ code: "Quantity" }] }, depth: { type: [{ code: "Quantity" }] }, weight: { type: [{ code: "Quantity" }] }, nominalVolume: { type: [{ code: "Quantity" }] }, externalDiameter: { type: [{ code: "Quantity" }] }, shape: { type: [{ code: "string" }] }, color: { max: 9007199254740991, type: [{ code: "string" }] }, imprint: { max: 9007199254740991, type: [{ code: "string" }] }, image: { max: 9007199254740991, type: [{ code: "Attachment" }] }, scoring: { type: [{ code: "CodeableConcept" }] } } }, ProductShelfLife: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, modifierExtension: { max: 9007199254740991, type: [{ code: "Extension" }] }, identifier: { type: [{ code: "Identifier" }] }, type: { min: 1, type: [{ code: "CodeableConcept" }] }, period: { min: 1, type: [{ code: "Quantity" }] }, specialPrecautionsForStorage: { max: 9007199254740991, type: [{ code: "CodeableConcept" }] } } }, Quantity: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, value: { type: [{ code: "decimal" }] }, comparator: { type: [{ code: "code" }] }, unit: { type: [{ code: "string" }] }, system: { type: [{ code: "uri" }] }, code: { type: [{ code: "code" }] } } }, Range: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, low: { type: [{ code: "Quantity" }] }, high: { type: [{ code: "Quantity" }] } } }, Ratio: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, numerator: { type: [{ code: "Quantity" }] }, denominator: { type: [{ code: "Quantity" }] } } }, Reference: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, reference: { type: [{ code: "string" }] }, type: { type: [{ code: "uri" }] }, identifier: { type: [{ code: "Identifier" }] }, display: { type: [{ code: "string" }] } } }, RelatedArtifact: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, type: { min: 1, type: [{ code: "code" }] }, label: { type: [{ code: "string" }] }, display: { type: [{ code: "string" }] }, citation: { type: [{ code: "markdown" }] }, url: { type: [{ code: "url" }] }, document: { type: [{ code: "Attachment" }] }, resource: { type: [{ code: "canonical", targetProfile: ["http://hl7.org/fhir/StructureDefinition/Resource"] }] } } }, SampledData: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, origin: { min: 1, type: [{ code: "Quantity" }] }, period: { min: 1, type: [{ code: "decimal" }] }, factor: { type: [{ code: "decimal" }] }, lowerLimit: { type: [{ code: "decimal" }] }, upperLimit: { type: [{ code: "decimal" }] }, dimensions: { min: 1, type: [{ code: "positiveInt" }] }, data: { type: [{ code: "string" }] } } }, Signature: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, type: { min: 1, max: 9007199254740991, type: [{ code: "Coding" }] }, when: { min: 1, type: [{ code: "instant" }] }, who: { min: 1, type: [{ code: "Reference", targetProfile: ["http://hl7.org/fhir/StructureDefinition/Practitioner", "http://hl7.org/fhir/StructureDefinition/PractitionerRole", "http://hl7.org/fhir/StructureDefinition/RelatedPerson", "http://hl7.org/fhir/StructureDefinition/Patient", "http://hl7.org/fhir/StructureDefinition/Device", "http://hl7.org/fhir/StructureDefinition/Organization"] }] }, onBehalfOf: { type: [{ code: "Reference", targetProfile: ["http://hl7.org/fhir/StructureDefinition/Practitioner", "http://hl7.org/fhir/StructureDefinition/PractitionerRole", "http://hl7.org/fhir/StructureDefinition/RelatedPerson", "http://hl7.org/fhir/StructureDefinition/Patient", "http://hl7.org/fhir/StructureDefinition/Device", "http://hl7.org/fhir/StructureDefinition/Organization"] }] }, targetFormat: { type: [{ code: "code" }] }, sigFormat: { type: [{ code: "code" }] }, data: { type: [{ code: "base64Binary" }] } } }, SubstanceAmount: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, modifierExtension: { max: 9007199254740991, type: [{ code: "Extension" }] }, "amount[x]": { type: [{ code: "Quantity" }, { code: "Range" }, { code: "string" }] }, amountType: { type: [{ code: "CodeableConcept" }] }, amountText: { type: [{ code: "string" }] }, referenceRange: { type: [{ code: "SubstanceAmountReferenceRange" }] } } }, Timing: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, modifierExtension: { max: 9007199254740991, type: [{ code: "Extension" }] }, event: { max: 9007199254740991, type: [{ code: "dateTime" }] }, repeat: { type: [{ code: "TimingRepeat" }] }, code: { type: [{ code: "CodeableConcept" }] } } }, TriggerDefinition: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, type: { min: 1, type: [{ code: "code" }] }, name: { type: [{ code: "string" }] }, "timing[x]": { type: [{ code: "Timing" }, { code: "Reference", targetProfile: ["http://hl7.org/fhir/StructureDefinition/Schedule"] }, { code: "date" }, { code: "dateTime" }] }, data: { max: 9007199254740991, type: [{ code: "DataRequirement" }] }, condition: { type: [{ code: "Expression" }] } } }, UsageContext: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, code: { min: 1, type: [{ code: "Coding" }] }, "value[x]": { min: 1, type: [{ code: "CodeableConcept" }, { code: "Quantity" }, { code: "Range" }, { code: "Reference", targetProfile: ["http://hl7.org/fhir/StructureDefinition/PlanDefinition", "http://hl7.org/fhir/StructureDefinition/ResearchStudy", "http://hl7.org/fhir/StructureDefinition/InsurancePlan", "http://hl7.org/fhir/StructureDefinition/HealthcareService", "http://hl7.org/fhir/StructureDefinition/Group", "http://hl7.org/fhir/StructureDefinition/Location", "http://hl7.org/fhir/StructureDefinition/Organization"] }] } } }, MoneyQuantity: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, value: { type: [{ code: "decimal" }] }, comparator: { type: [{ code: "code" }] }, unit: { type: [{ code: "string" }] }, system: { type: [{ code: "uri" }] }, code: { type: [{ code: "code" }] } } }, SimpleQuantity: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, value: { type: [{ code: "decimal" }] }, comparator: { max: 0, type: [{ code: "code" }] }, unit: { type: [{ code: "string" }] }, system: { type: [{ code: "uri" }] }, code: { type: [{ code: "code" }] } } }, MetadataResource: { elements: { id: { type: [{ code: "string" }] }, meta: { type: [{ code: "Meta" }] }, implicitRules: { type: [{ code: "uri" }] }, language: { type: [{ code: "code" }] }, text: { type: [{ code: "Narrative" }] }, contained: { max: 9007199254740991, type: [{ code: "Resource" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, modifierExtension: { max: 9007199254740991, type: [{ code: "Extension" }] }, url: { type: [{ code: "uri" }] }, version: { type: [{ code: "string" }] }, name: { type: [{ code: "string" }] }, title: { type: [{ code: "string" }] }, status: { min: 1, type: [{ code: "code" }] }, experimental: { type: [{ code: "boolean" }] }, date: { type: [{ code: "dateTime" }] }, publisher: { type: [{ code: "string" }] }, contact: { max: 9007199254740991, type: [{ code: "ContactDetail" }] }, description: { type: [{ code: "markdown" }] }, useContext: { max: 9007199254740991, type: [{ code: "UsageContext" }] }, jurisdiction: { max: 9007199254740991, type: [{ code: "CodeableConcept" }] } } }, IdentityProvider: { elements: { authorizeUrl: { min: 1, type: [{ code: "string" }] }, tokenUrl: { min: 1, type: [{ code: "string" }] }, tokenAuthMethod: { type: [{ code: "code" }] }, userInfoUrl: { min: 1, type: [{ code: "string" }] }, clientId: { min: 1, type: [{ code: "string" }] }, clientSecret: { min: 1, type: [{ code: "string" }] }, usePkce: { type: [{ code: "boolean" }] }, useSubject: { type: [{ code: "boolean" }] } } } };
-function d(r4) {
+var Er = { Element: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] } } }, BackboneElement: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, modifierExtension: { max: 9007199254740991, type: [{ code: "Extension" }] } } }, Address: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, use: { type: [{ code: "code" }] }, type: { type: [{ code: "code" }] }, text: { type: [{ code: "string" }] }, line: { max: 9007199254740991, type: [{ code: "string" }] }, city: { type: [{ code: "string" }] }, district: { type: [{ code: "string" }] }, state: { type: [{ code: "string" }] }, postalCode: { type: [{ code: "string" }] }, country: { type: [{ code: "string" }] }, period: { type: [{ code: "Period" }] } } }, Age: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, value: { type: [{ code: "decimal" }] }, comparator: { type: [{ code: "code" }] }, unit: { type: [{ code: "string" }] }, system: { type: [{ code: "uri" }] }, code: { type: [{ code: "code" }] } } }, Annotation: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, "author[x]": { type: [{ code: "Reference", targetProfile: ["http://hl7.org/fhir/StructureDefinition/Practitioner", "http://hl7.org/fhir/StructureDefinition/Patient", "http://hl7.org/fhir/StructureDefinition/RelatedPerson", "http://hl7.org/fhir/StructureDefinition/Organization"] }, { code: "string" }] }, time: { type: [{ code: "dateTime" }] }, text: { min: 1, type: [{ code: "markdown" }] } } }, Attachment: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, contentType: { type: [{ code: "code" }] }, language: { type: [{ code: "code" }] }, data: { type: [{ code: "base64Binary" }] }, url: { type: [{ code: "url" }] }, size: { type: [{ code: "unsignedInt" }] }, hash: { type: [{ code: "base64Binary" }] }, title: { type: [{ code: "string" }] }, creation: { type: [{ code: "dateTime" }] } } }, CodeableConcept: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, coding: { max: 9007199254740991, type: [{ code: "Coding" }] }, text: { type: [{ code: "string" }] } } }, Coding: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, system: { type: [{ code: "uri" }] }, version: { type: [{ code: "string" }] }, code: { type: [{ code: "code" }] }, display: { type: [{ code: "string" }] }, userSelected: { type: [{ code: "boolean" }] } } }, ContactDetail: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, name: { type: [{ code: "string" }] }, telecom: { max: 9007199254740991, type: [{ code: "ContactPoint" }] } } }, ContactPoint: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, system: { type: [{ code: "code" }] }, value: { type: [{ code: "string" }] }, use: { type: [{ code: "code" }] }, rank: { type: [{ code: "positiveInt" }] }, period: { type: [{ code: "Period" }] } } }, Contributor: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, type: { min: 1, type: [{ code: "code" }] }, name: { min: 1, type: [{ code: "string" }] }, contact: { max: 9007199254740991, type: [{ code: "ContactDetail" }] } } }, Count: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, value: { type: [{ code: "decimal" }] }, comparator: { type: [{ code: "code" }] }, unit: { type: [{ code: "string" }] }, system: { type: [{ code: "uri" }] }, code: { type: [{ code: "code" }] } } }, DataRequirement: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, type: { min: 1, type: [{ code: "code" }] }, profile: { max: 9007199254740991, type: [{ code: "canonical", targetProfile: ["http://hl7.org/fhir/StructureDefinition/StructureDefinition"] }] }, "subject[x]": { type: [{ code: "CodeableConcept" }, { code: "Reference", targetProfile: ["http://hl7.org/fhir/StructureDefinition/Group"] }] }, mustSupport: { max: 9007199254740991, type: [{ code: "string" }] }, codeFilter: { max: 9007199254740991, type: [{ code: "DataRequirementCodeFilter" }] }, dateFilter: { max: 9007199254740991, type: [{ code: "DataRequirementDateFilter" }] }, limit: { type: [{ code: "positiveInt" }] }, sort: { max: 9007199254740991, type: [{ code: "DataRequirementSort" }] } } }, Distance: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, value: { type: [{ code: "decimal" }] }, comparator: { type: [{ code: "code" }] }, unit: { type: [{ code: "string" }] }, system: { type: [{ code: "uri" }] }, code: { type: [{ code: "code" }] } } }, Dosage: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, modifierExtension: { max: 9007199254740991, type: [{ code: "Extension" }] }, sequence: { type: [{ code: "integer" }] }, text: { type: [{ code: "string" }] }, additionalInstruction: { max: 9007199254740991, type: [{ code: "CodeableConcept" }] }, patientInstruction: { type: [{ code: "string" }] }, timing: { type: [{ code: "Timing" }] }, "asNeeded[x]": { type: [{ code: "boolean" }, { code: "CodeableConcept" }] }, site: { type: [{ code: "CodeableConcept" }] }, route: { type: [{ code: "CodeableConcept" }] }, method: { type: [{ code: "CodeableConcept" }] }, doseAndRate: { max: 9007199254740991, type: [{ code: "DosageDoseAndRate" }] }, maxDosePerPeriod: { type: [{ code: "Ratio" }] }, maxDosePerAdministration: { type: [{ code: "Quantity" }] }, maxDosePerLifetime: { type: [{ code: "Quantity" }] } } }, Duration: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, value: { type: [{ code: "decimal" }] }, comparator: { type: [{ code: "code" }] }, unit: { type: [{ code: "string" }] }, system: { type: [{ code: "uri" }] }, code: { type: [{ code: "code" }] } } }, ElementDefinition: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, modifierExtension: { max: 9007199254740991, type: [{ code: "Extension" }] }, path: { min: 1, type: [{ code: "string" }] }, representation: { max: 9007199254740991, type: [{ code: "code" }] }, sliceName: { type: [{ code: "string" }] }, sliceIsConstraining: { type: [{ code: "boolean" }] }, label: { type: [{ code: "string" }] }, code: { max: 9007199254740991, type: [{ code: "Coding" }] }, slicing: { type: [{ code: "ElementDefinitionSlicing" }] }, short: { type: [{ code: "string" }] }, definition: { type: [{ code: "markdown" }] }, comment: { type: [{ code: "markdown" }] }, requirements: { type: [{ code: "markdown" }] }, alias: { max: 9007199254740991, type: [{ code: "string" }] }, min: { type: [{ code: "unsignedInt" }] }, max: { type: [{ code: "string" }] }, base: { type: [{ code: "ElementDefinitionBase" }] }, contentReference: { type: [{ code: "uri" }] }, type: { max: 9007199254740991, type: [{ code: "ElementDefinitionType" }] }, "defaultValue[x]": { type: [{ code: "base64Binary" }, { code: "boolean" }, { code: "canonical" }, { code: "code" }, { code: "date" }, { code: "dateTime" }, { code: "decimal" }, { code: "id" }, { code: "instant" }, { code: "integer" }, { code: "markdown" }, { code: "oid" }, { code: "positiveInt" }, { code: "string" }, { code: "time" }, { code: "unsignedInt" }, { code: "uri" }, { code: "url" }, { code: "uuid" }, { code: "Address" }, { code: "Age" }, { code: "Annotation" }, { code: "Attachment" }, { code: "CodeableConcept" }, { code: "Coding" }, { code: "ContactPoint" }, { code: "Count" }, { code: "Distance" }, { code: "Duration" }, { code: "HumanName" }, { code: "Identifier" }, { code: "Money" }, { code: "Period" }, { code: "Quantity" }, { code: "Range" }, { code: "Ratio" }, { code: "Reference" }, { code: "SampledData" }, { code: "Signature" }, { code: "Timing" }, { code: "ContactDetail" }, { code: "Contributor" }, { code: "DataRequirement" }, { code: "Expression" }, { code: "ParameterDefinition" }, { code: "RelatedArtifact" }, { code: "TriggerDefinition" }, { code: "UsageContext" }, { code: "Dosage" }, { code: "Meta" }] }, meaningWhenMissing: { type: [{ code: "markdown" }] }, orderMeaning: { type: [{ code: "string" }] }, "fixed[x]": { type: [{ code: "base64Binary" }, { code: "boolean" }, { code: "canonical" }, { code: "code" }, { code: "date" }, { code: "dateTime" }, { code: "decimal" }, { code: "id" }, { code: "instant" }, { code: "integer" }, { code: "markdown" }, { code: "oid" }, { code: "positiveInt" }, { code: "string" }, { code: "time" }, { code: "unsignedInt" }, { code: "uri" }, { code: "url" }, { code: "uuid" }, { code: "Address" }, { code: "Age" }, { code: "Annotation" }, { code: "Attachment" }, { code: "CodeableConcept" }, { code: "Coding" }, { code: "ContactPoint" }, { code: "Count" }, { code: "Distance" }, { code: "Duration" }, { code: "HumanName" }, { code: "Identifier" }, { code: "Money" }, { code: "Period" }, { code: "Quantity" }, { code: "Range" }, { code: "Ratio" }, { code: "Reference" }, { code: "SampledData" }, { code: "Signature" }, { code: "Timing" }, { code: "ContactDetail" }, { code: "Contributor" }, { code: "DataRequirement" }, { code: "Expression" }, { code: "ParameterDefinition" }, { code: "RelatedArtifact" }, { code: "TriggerDefinition" }, { code: "UsageContext" }, { code: "Dosage" }, { code: "Meta" }] }, "pattern[x]": { type: [{ code: "base64Binary" }, { code: "boolean" }, { code: "canonical" }, { code: "code" }, { code: "date" }, { code: "dateTime" }, { code: "decimal" }, { code: "id" }, { code: "instant" }, { code: "integer" }, { code: "markdown" }, { code: "oid" }, { code: "positiveInt" }, { code: "string" }, { code: "time" }, { code: "unsignedInt" }, { code: "uri" }, { code: "url" }, { code: "uuid" }, { code: "Address" }, { code: "Age" }, { code: "Annotation" }, { code: "Attachment" }, { code: "CodeableConcept" }, { code: "Coding" }, { code: "ContactPoint" }, { code: "Count" }, { code: "Distance" }, { code: "Duration" }, { code: "HumanName" }, { code: "Identifier" }, { code: "Money" }, { code: "Period" }, { code: "Quantity" }, { code: "Range" }, { code: "Ratio" }, { code: "Reference" }, { code: "SampledData" }, { code: "Signature" }, { code: "Timing" }, { code: "ContactDetail" }, { code: "Contributor" }, { code: "DataRequirement" }, { code: "Expression" }, { code: "ParameterDefinition" }, { code: "RelatedArtifact" }, { code: "TriggerDefinition" }, { code: "UsageContext" }, { code: "Dosage" }, { code: "Meta" }] }, example: { max: 9007199254740991, type: [{ code: "ElementDefinitionExample" }] }, "minValue[x]": { type: [{ code: "date" }, { code: "dateTime" }, { code: "instant" }, { code: "time" }, { code: "decimal" }, { code: "integer" }, { code: "positiveInt" }, { code: "unsignedInt" }, { code: "Quantity" }] }, "maxValue[x]": { type: [{ code: "date" }, { code: "dateTime" }, { code: "instant" }, { code: "time" }, { code: "decimal" }, { code: "integer" }, { code: "positiveInt" }, { code: "unsignedInt" }, { code: "Quantity" }] }, maxLength: { type: [{ code: "integer" }] }, condition: { max: 9007199254740991, type: [{ code: "id" }] }, constraint: { max: 9007199254740991, type: [{ code: "ElementDefinitionConstraint" }] }, mustSupport: { type: [{ code: "boolean" }] }, isModifier: { type: [{ code: "boolean" }] }, isModifierReason: { type: [{ code: "string" }] }, isSummary: { type: [{ code: "boolean" }] }, binding: { type: [{ code: "ElementDefinitionBinding" }] }, mapping: { max: 9007199254740991, type: [{ code: "ElementDefinitionMapping" }] } } }, Expression: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, description: { type: [{ code: "string" }] }, name: { type: [{ code: "id" }] }, language: { min: 1, type: [{ code: "code" }] }, expression: { type: [{ code: "string" }] }, reference: { type: [{ code: "uri" }] } } }, Extension: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, url: { min: 1, type: [{ code: "string" }] }, "value[x]": { type: [{ code: "base64Binary" }, { code: "boolean" }, { code: "canonical" }, { code: "code" }, { code: "date" }, { code: "dateTime" }, { code: "decimal" }, { code: "id" }, { code: "instant" }, { code: "integer" }, { code: "markdown" }, { code: "oid" }, { code: "positiveInt" }, { code: "string" }, { code: "time" }, { code: "unsignedInt" }, { code: "uri" }, { code: "url" }, { code: "uuid" }, { code: "Address" }, { code: "Age" }, { code: "Annotation" }, { code: "Attachment" }, { code: "CodeableConcept" }, { code: "Coding" }, { code: "ContactPoint" }, { code: "Count" }, { code: "Distance" }, { code: "Duration" }, { code: "HumanName" }, { code: "Identifier" }, { code: "Money" }, { code: "Period" }, { code: "Quantity" }, { code: "Range" }, { code: "Ratio" }, { code: "Reference" }, { code: "SampledData" }, { code: "Signature" }, { code: "Timing" }, { code: "ContactDetail" }, { code: "Contributor" }, { code: "DataRequirement" }, { code: "Expression" }, { code: "ParameterDefinition" }, { code: "RelatedArtifact" }, { code: "TriggerDefinition" }, { code: "UsageContext" }, { code: "Dosage" }, { code: "Meta" }] } } }, HumanName: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, use: { type: [{ code: "code" }] }, text: { type: [{ code: "string" }] }, family: { type: [{ code: "string" }] }, given: { max: 9007199254740991, type: [{ code: "string" }] }, prefix: { max: 9007199254740991, type: [{ code: "string" }] }, suffix: { max: 9007199254740991, type: [{ code: "string" }] }, period: { type: [{ code: "Period" }] } } }, Identifier: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, use: { type: [{ code: "code" }] }, type: { type: [{ code: "CodeableConcept" }] }, system: { type: [{ code: "uri" }] }, value: { type: [{ code: "string" }] }, period: { type: [{ code: "Period" }] }, assigner: { type: [{ code: "Reference", targetProfile: ["http://hl7.org/fhir/StructureDefinition/Organization"] }] } } }, MarketingStatus: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, modifierExtension: { max: 9007199254740991, type: [{ code: "Extension" }] }, country: { min: 1, type: [{ code: "CodeableConcept" }] }, jurisdiction: { type: [{ code: "CodeableConcept" }] }, status: { min: 1, type: [{ code: "CodeableConcept" }] }, dateRange: { min: 1, type: [{ code: "Period" }] }, restoreDate: { type: [{ code: "dateTime" }] } } }, Meta: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, versionId: { type: [{ code: "id" }] }, lastUpdated: { type: [{ code: "instant" }] }, source: { type: [{ code: "uri" }] }, profile: { max: 9007199254740991, type: [{ code: "canonical", targetProfile: ["http://hl7.org/fhir/StructureDefinition/StructureDefinition"] }] }, security: { max: 9007199254740991, type: [{ code: "Coding" }] }, tag: { max: 9007199254740991, type: [{ code: "Coding" }] }, project: { type: [{ code: "uri" }] }, author: { type: [{ code: "Reference" }] }, account: { type: [{ code: "Reference" }] }, compartment: { max: 9007199254740991, type: [{ code: "Reference" }] } } }, Money: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, value: { type: [{ code: "decimal" }] }, currency: { type: [{ code: "code" }] } } }, Narrative: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, status: { min: 1, type: [{ code: "code" }] }, div: { min: 1, type: [{ code: "xhtml" }] } } }, ParameterDefinition: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, name: { type: [{ code: "code" }] }, use: { min: 1, type: [{ code: "code" }] }, min: { type: [{ code: "integer" }] }, max: { type: [{ code: "string" }] }, documentation: { type: [{ code: "string" }] }, type: { min: 1, type: [{ code: "code" }] }, profile: { type: [{ code: "canonical", targetProfile: ["http://hl7.org/fhir/StructureDefinition/StructureDefinition"] }] } } }, Period: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, start: { type: [{ code: "dateTime" }] }, end: { type: [{ code: "dateTime" }] } } }, Population: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, modifierExtension: { max: 9007199254740991, type: [{ code: "Extension" }] }, "age[x]": { type: [{ code: "Range" }, { code: "CodeableConcept" }] }, gender: { type: [{ code: "CodeableConcept" }] }, race: { type: [{ code: "CodeableConcept" }] }, physiologicalCondition: { type: [{ code: "CodeableConcept" }] } } }, ProdCharacteristic: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, modifierExtension: { max: 9007199254740991, type: [{ code: "Extension" }] }, height: { type: [{ code: "Quantity" }] }, width: { type: [{ code: "Quantity" }] }, depth: { type: [{ code: "Quantity" }] }, weight: { type: [{ code: "Quantity" }] }, nominalVolume: { type: [{ code: "Quantity" }] }, externalDiameter: { type: [{ code: "Quantity" }] }, shape: { type: [{ code: "string" }] }, color: { max: 9007199254740991, type: [{ code: "string" }] }, imprint: { max: 9007199254740991, type: [{ code: "string" }] }, image: { max: 9007199254740991, type: [{ code: "Attachment" }] }, scoring: { type: [{ code: "CodeableConcept" }] } } }, ProductShelfLife: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, modifierExtension: { max: 9007199254740991, type: [{ code: "Extension" }] }, identifier: { type: [{ code: "Identifier" }] }, type: { min: 1, type: [{ code: "CodeableConcept" }] }, period: { min: 1, type: [{ code: "Quantity" }] }, specialPrecautionsForStorage: { max: 9007199254740991, type: [{ code: "CodeableConcept" }] } } }, Quantity: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, value: { type: [{ code: "decimal" }] }, comparator: { type: [{ code: "code" }] }, unit: { type: [{ code: "string" }] }, system: { type: [{ code: "uri" }] }, code: { type: [{ code: "code" }] } } }, Range: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, low: { type: [{ code: "Quantity" }] }, high: { type: [{ code: "Quantity" }] } } }, Ratio: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, numerator: { type: [{ code: "Quantity" }] }, denominator: { type: [{ code: "Quantity" }] } } }, Reference: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, reference: { type: [{ code: "string" }] }, type: { type: [{ code: "uri" }] }, identifier: { type: [{ code: "Identifier" }] }, display: { type: [{ code: "string" }] } } }, RelatedArtifact: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, type: { min: 1, type: [{ code: "code" }] }, label: { type: [{ code: "string" }] }, display: { type: [{ code: "string" }] }, citation: { type: [{ code: "markdown" }] }, url: { type: [{ code: "url" }] }, document: { type: [{ code: "Attachment" }] }, resource: { type: [{ code: "canonical", targetProfile: ["http://hl7.org/fhir/StructureDefinition/Resource"] }] } } }, SampledData: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, origin: { min: 1, type: [{ code: "Quantity" }] }, period: { min: 1, type: [{ code: "decimal" }] }, factor: { type: [{ code: "decimal" }] }, lowerLimit: { type: [{ code: "decimal" }] }, upperLimit: { type: [{ code: "decimal" }] }, dimensions: { min: 1, type: [{ code: "positiveInt" }] }, data: { type: [{ code: "string" }] } } }, Signature: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, type: { min: 1, max: 9007199254740991, type: [{ code: "Coding" }] }, when: { min: 1, type: [{ code: "instant" }] }, who: { min: 1, type: [{ code: "Reference", targetProfile: ["http://hl7.org/fhir/StructureDefinition/Practitioner", "http://hl7.org/fhir/StructureDefinition/PractitionerRole", "http://hl7.org/fhir/StructureDefinition/RelatedPerson", "http://hl7.org/fhir/StructureDefinition/Patient", "http://hl7.org/fhir/StructureDefinition/Device", "http://hl7.org/fhir/StructureDefinition/Organization"] }] }, onBehalfOf: { type: [{ code: "Reference", targetProfile: ["http://hl7.org/fhir/StructureDefinition/Practitioner", "http://hl7.org/fhir/StructureDefinition/PractitionerRole", "http://hl7.org/fhir/StructureDefinition/RelatedPerson", "http://hl7.org/fhir/StructureDefinition/Patient", "http://hl7.org/fhir/StructureDefinition/Device", "http://hl7.org/fhir/StructureDefinition/Organization"] }] }, targetFormat: { type: [{ code: "code" }] }, sigFormat: { type: [{ code: "code" }] }, data: { type: [{ code: "base64Binary" }] } } }, SubstanceAmount: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, modifierExtension: { max: 9007199254740991, type: [{ code: "Extension" }] }, "amount[x]": { type: [{ code: "Quantity" }, { code: "Range" }, { code: "string" }] }, amountType: { type: [{ code: "CodeableConcept" }] }, amountText: { type: [{ code: "string" }] }, referenceRange: { type: [{ code: "SubstanceAmountReferenceRange" }] } } }, Timing: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, modifierExtension: { max: 9007199254740991, type: [{ code: "Extension" }] }, event: { max: 9007199254740991, type: [{ code: "dateTime" }] }, repeat: { type: [{ code: "TimingRepeat" }] }, code: { type: [{ code: "CodeableConcept" }] } } }, TriggerDefinition: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, type: { min: 1, type: [{ code: "code" }] }, name: { type: [{ code: "string" }] }, "timing[x]": { type: [{ code: "Timing" }, { code: "Reference", targetProfile: ["http://hl7.org/fhir/StructureDefinition/Schedule"] }, { code: "date" }, { code: "dateTime" }] }, data: { max: 9007199254740991, type: [{ code: "DataRequirement" }] }, condition: { type: [{ code: "Expression" }] } } }, UsageContext: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, code: { min: 1, type: [{ code: "Coding" }] }, "value[x]": { min: 1, type: [{ code: "CodeableConcept" }, { code: "Quantity" }, { code: "Range" }, { code: "Reference", targetProfile: ["http://hl7.org/fhir/StructureDefinition/PlanDefinition", "http://hl7.org/fhir/StructureDefinition/ResearchStudy", "http://hl7.org/fhir/StructureDefinition/InsurancePlan", "http://hl7.org/fhir/StructureDefinition/HealthcareService", "http://hl7.org/fhir/StructureDefinition/Group", "http://hl7.org/fhir/StructureDefinition/Location", "http://hl7.org/fhir/StructureDefinition/Organization"] }] } } }, MoneyQuantity: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, value: { type: [{ code: "decimal" }] }, comparator: { type: [{ code: "code" }] }, unit: { type: [{ code: "string" }] }, system: { type: [{ code: "uri" }] }, code: { type: [{ code: "code" }] } } }, SimpleQuantity: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, value: { type: [{ code: "decimal" }] }, comparator: { max: 0, type: [{ code: "code" }] }, unit: { type: [{ code: "string" }] }, system: { type: [{ code: "uri" }] }, code: { type: [{ code: "code" }] } } }, MetadataResource: { elements: { id: { type: [{ code: "string" }] }, meta: { type: [{ code: "Meta" }] }, implicitRules: { type: [{ code: "uri" }] }, language: { type: [{ code: "code" }] }, text: { type: [{ code: "Narrative" }] }, contained: { max: 9007199254740991, type: [{ code: "Resource" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, modifierExtension: { max: 9007199254740991, type: [{ code: "Extension" }] }, url: { type: [{ code: "uri" }] }, version: { type: [{ code: "string" }] }, name: { type: [{ code: "string" }] }, title: { type: [{ code: "string" }] }, status: { min: 1, type: [{ code: "code" }] }, experimental: { type: [{ code: "boolean" }] }, date: { type: [{ code: "dateTime" }] }, publisher: { type: [{ code: "string" }] }, contact: { max: 9007199254740991, type: [{ code: "ContactDetail" }] }, description: { type: [{ code: "markdown" }] }, useContext: { max: 9007199254740991, type: [{ code: "UsageContext" }] }, jurisdiction: { max: 9007199254740991, type: [{ code: "CodeableConcept" }] } } }, IdentityProvider: { elements: { authorizeUrl: { min: 1, type: [{ code: "string" }] }, tokenUrl: { min: 1, type: [{ code: "string" }] }, tokenAuthMethod: { type: [{ code: "code" }] }, userInfoUrl: { min: 1, type: [{ code: "string" }] }, clientId: { min: 1, type: [{ code: "string" }] }, clientSecret: { min: 1, type: [{ code: "string" }] }, usePkce: { type: [{ code: "boolean" }] }, useSubject: { type: [{ code: "boolean" }] } } } };
+function p(r4) {
   return [{ type: c.boolean, value: r4 }];
 }
-function g(r4) {
-  return r4 == null ? { type: "undefined", value: void 0 } : Number.isSafeInteger(r4) ? { type: c.integer, value: r4 } : typeof r4 == "number" ? { type: c.decimal, value: r4 } : typeof r4 == "boolean" ? { type: c.boolean, value: r4 } : typeof r4 == "string" ? { type: c.string, value: r4 } : b(r4) ? { type: c.Quantity, value: r4 } : M(r4) ? { type: r4.resourceType, value: r4 } : { type: c.BackboneElement, value: r4 };
+function y(r4) {
+  return r4 == null ? { type: "undefined", value: void 0 } : Number.isSafeInteger(r4) ? { type: c.integer, value: r4 } : typeof r4 == "number" ? { type: c.decimal, value: r4 } : typeof r4 == "boolean" ? { type: c.boolean, value: r4 } : typeof r4 == "string" ? { type: c.string, value: r4 } : P(r4) ? { type: c.Quantity, value: r4 } : _(r4) ? { type: r4.resourceType, value: r4 } : { type: c.BackboneElement, value: r4 };
 }
-function V(r4) {
+function D(r4) {
   return r4.length === 0 ? false : !!r4[0].value;
 }
-function _(r4, e) {
+function M(r4, e) {
   if (r4.length !== 0) {
     if (r4.length === 1 && (!e || r4[0].type === e))
       return r4[0];
@@ -39151,10 +39189,10 @@ function _(r4, e) {
 function A(r4, e) {
   if (!r4.value)
     return;
-  let t = Ve(r4.type, e);
-  return t ? oi(r4.value, e, t) : si(r4, e);
+  let t = _e(r4.type, e);
+  return t ? di(r4.value, e, t) : pi(r4, e);
 }
-function oi(r4, e, t) {
+function di(r4, e, t) {
   let n = t.type;
   if (!n || n.length === 0)
     return;
@@ -39162,7 +39200,7 @@ function oi(r4, e, t) {
   if (t.path.endsWith("[x]")) {
     let a = t.path.split(".").pop().replace("[x]", "");
     for (let u2 of n) {
-      let l2 = a + w(u2.code);
+      let l2 = a + I(u2.code);
       if (i2 = r4[l2], s = r4["_" + l2], i2 !== void 0 || s !== void 0) {
         o = u2.code;
         break;
@@ -39173,16 +39211,16 @@ function oi(r4, e, t) {
   if (s)
     if (Array.isArray(i2))
       for (let a = 0; a < Math.max(i2.length, s.length); a++)
-        i2[a] = xr(i2[a], s[a]);
+        i2[a] = Cr(i2[a], s[a]);
     else
-      i2 = xr(i2, s);
-  if (!E(i2))
-    return (o === "Element" || o === "BackboneElement") && (o = t.type[0].code), Array.isArray(i2) ? i2.map((a) => hr(a, o)) : hr(i2, o);
+      i2 = Cr(i2, s);
+  if (!R(i2))
+    return (o === "Element" || o === "BackboneElement") && (o = t.type[0].code), Array.isArray(i2) ? i2.map((a) => br(a, o)) : br(i2, o);
 }
-function hr(r4, e) {
-  return e === "Resource" && M(r4) && (e = r4.resourceType), { type: e, value: r4 };
+function br(r4, e) {
+  return e === "Resource" && _(r4) && (e = r4.resourceType), { type: e, value: r4 };
 }
-function si(r4, e) {
+function pi(r4, e) {
   let t = r4.value;
   if (!t || typeof t != "object")
     return;
@@ -39191,21 +39229,21 @@ function si(r4, e) {
     n = t[e];
   else
     for (let i2 in c) {
-      let o = e + w(i2);
+      let o = e + I(i2);
       if (o in t) {
         n = t[o];
         break;
       }
     }
-  if (!E(n))
-    return Array.isArray(n) ? n.map(g) : g(n);
+  if (!R(n))
+    return Array.isArray(n) ? n.map(y) : y(n);
 }
-function ke(r4) {
+function Fe(r4) {
   let e = [];
   for (let t of r4) {
     let n = false;
     for (let i2 of e)
-      if (V(Tr(t, i2))) {
+      if (D(Ar(t, i2))) {
         n = true;
         break;
       }
@@ -39213,28 +39251,28 @@ function ke(r4) {
   }
   return e;
 }
-function ft(r4) {
-  return d(!V(r4));
+function St(r4) {
+  return p(!D(r4));
 }
-function mt(r4, e) {
-  return r4.length === 0 || e.length === 0 ? [] : r4.length !== e.length ? d(false) : d(r4.every((t, n) => V(Tr(t, e[n]))));
+function Et(r4, e) {
+  return r4.length === 0 || e.length === 0 ? [] : r4.length !== e.length ? p(false) : p(r4.every((t, n) => D(Ar(t, e[n]))));
 }
-function Tr(r4, e) {
+function Ar(r4, e) {
   let t = r4.value?.valueOf(), n = e.value?.valueOf();
-  return typeof t == "number" && typeof n == "number" ? d(Math.abs(t - n) < 1e-8) : b(t) && b(n) ? d(vr(t, n)) : d(typeof t == "object" && typeof n == "object" ? yt(r4, e) : t === n);
+  return typeof t == "number" && typeof n == "number" ? p(Math.abs(t - n) < 1e-8) : P(t) && P(n) ? p(wr(t, n)) : p(typeof t == "object" && typeof n == "object" ? Rt(r4, e) : t === n);
 }
-function ht(r4, e) {
-  return r4.length === 0 && e.length === 0 ? d(true) : r4.length !== e.length ? d(false) : (r4.sort(yr), e.sort(yr), d(r4.every((t, n) => V(ai(t, e[n])))));
+function bt(r4, e) {
+  return r4.length === 0 && e.length === 0 ? p(true) : r4.length !== e.length ? p(false) : (r4.sort(Rr), e.sort(Rr), p(r4.every((t, n) => D(fi(t, e[n])))));
 }
-function ai(r4, e) {
+function fi(r4, e) {
   let { type: t, value: n } = r4, { type: i2, value: o } = e, s = n?.valueOf(), a = o?.valueOf();
-  return typeof s == "number" && typeof a == "number" ? d(Math.abs(s - a) < 0.01) : b(s) && b(a) ? d(vr(s, a)) : d(t === "Coding" && i2 === "Coding" ? typeof s != "object" || typeof a != "object" ? false : s.code === a.code && s.system === a.system : typeof s == "object" && typeof a == "object" ? yt({ ...s, id: void 0 }, { ...a, id: void 0 }) : typeof s == "string" && typeof a == "string" ? s.toLowerCase() === a.toLowerCase() : s === a);
+  return typeof s == "number" && typeof a == "number" ? p(Math.abs(s - a) < 0.01) : P(s) && P(a) ? p(wr(s, a)) : p(t === "Coding" && i2 === "Coding" ? typeof s != "object" || typeof a != "object" ? false : s.code === a.code && s.system === a.system : typeof s == "object" && typeof a == "object" ? Rt({ ...s, id: void 0 }, { ...a, id: void 0 }) : typeof s == "string" && typeof a == "string" ? s.toLowerCase() === a.toLowerCase() : s === a);
 }
-function yr(r4, e) {
+function Rr(r4, e) {
   let t = r4.value?.valueOf(), n = e.value?.valueOf();
   return typeof t == "number" && typeof n == "number" ? t - n : typeof t == "string" && typeof n == "string" ? t.localeCompare(n) : 0;
 }
-function Oe(r4, e) {
+function Me(r4, e) {
   let { value: t } = r4;
   if (t == null)
     return false;
@@ -39251,127 +39289,89 @@ function Oe(r4, e) {
     case "Time":
       return typeof t == "string" && !!/^T\d/.exec(t);
     case "Period":
-      return ci(t);
+      return mi(t);
     case "Quantity":
-      return b(t);
+      return P(t);
     default:
       return typeof t == "object" && t?.resourceType === e;
   }
 }
-function ci(r4) {
+function mi(r4) {
   return !!(r4 && typeof r4 == "object" && "start" in r4);
 }
-function b(r4) {
+function P(r4) {
   return !!(r4 && typeof r4 == "object" && "value" in r4 && typeof r4.value == "number");
 }
-function vr(r4, e) {
+function wr(r4, e) {
   return Math.abs(r4.value - e.value) < 0.01 && (r4.unit === e.unit || r4.code === e.code || r4.unit === e.code || r4.code === e.unit);
 }
-function yt(r4, e) {
+function Rt(r4, e) {
   let t = Object.keys(r4), n = Object.keys(e);
   if (t.length !== n.length)
     return false;
   for (let i2 of t) {
     let o = r4[i2], s = e[i2];
-    if (gr(o) && gr(s)) {
-      if (!yt(o, s))
+    if (Pr(o) && Pr(s)) {
+      if (!Rt(o, s))
         return false;
     } else if (o !== s)
       return false;
   }
   return true;
 }
-function gr(r4) {
+function Pr(r4) {
   return r4 !== null && typeof r4 == "object";
 }
-function xr(r4, e) {
+function Cr(r4, e) {
   if (e) {
     if (typeof e != "object")
       throw new Error("Primitive extension must be an object");
-    return ui(r4 ?? {}, e);
+    return hi(r4 ?? {}, e);
   }
   return r4;
 }
-function ui(r4, e) {
+function hi(r4, e) {
   return delete e.__proto__, delete e.constructor, Object.assign(r4, e);
 }
-var gt = "ok";
-var De = "created";
-var Tt = "not-modified";
-var vt = "not-found";
-var Ne = "accepted";
-var Rr = { resourceType: "OperationOutcome", id: vt, issue: [{ severity: "error", code: "not-found", details: { text: "Not found" } }] };
-function I(r4, e) {
-  return { resourceType: "OperationOutcome", issue: [{ severity: "error", code: "invalid", details: { text: r4 }, expression: e ? [e] : void 0 }] };
-}
-function h(r4) {
-  return { resourceType: "OperationOutcome", issue: [{ severity: "error", code: "structure", details: { text: r4 } }] };
-}
-function Fe(r4) {
-  return typeof r4 == "object" && r4 !== null && r4.resourceType === "OperationOutcome";
-}
-function St(r4) {
-  return r4.id === gt || r4.id === De || r4.id === Tt || r4.id === Ne;
-}
-var p = class extends Error {
-  constructor(t, n) {
-    super(Pr(t));
-    this.outcome = t, this.cause = n;
-  }
-};
-function _e(r4) {
-  return r4 instanceof p ? r4.outcome : Fe(r4) ? r4 : I(li(r4));
-}
-function li(r4) {
-  return r4 ? typeof r4 == "string" ? r4 : r4 instanceof Error ? r4.message : Fe(r4) ? Pr(r4) : typeof r4 == "object" && "code" in r4 && typeof r4.code == "string" ? r4.code : JSON.stringify(r4) : "Unknown error";
-}
-function Pr(r4) {
-  let e = r4.issue?.map(di) ?? [];
-  return e.length > 0 ? e.join("; ") : "Unknown error";
-}
-function di(r4) {
-  let e;
-  return r4.details?.text ? r4.diagnostics ? e = `${r4.details.text} (${r4.diagnostics})` : e = r4.details.text : r4.diagnostics ? e = r4.diagnostics : e = "Unknown error", r4.expression?.length && (e += ` (${r4.expression.join(", ")})`), e;
-}
-function At(r4) {
-  return new Rt(r4).parse();
-}
-var fe = fr(mr);
-var Ct = /* @__PURE__ */ Object.create(null);
-var wr = /* @__PURE__ */ Object.create(null);
 function wt(r4) {
+  return new Ct(r4).parse();
+}
+var me = Sr(Er);
+var It = /* @__PURE__ */ Object.create(null);
+var Ir = /* @__PURE__ */ Object.create(null);
+function kt(r4) {
   let e;
-  return r4 ? (e = wr[r4], e || (e = wr[r4] = /* @__PURE__ */ Object.create(null))) : e = fe, e;
+  return r4 ? (e = Ir[r4], e || (e = Ir[r4] = /* @__PURE__ */ Object.create(null))) : e = me, e;
 }
-function It(r4, e) {
+function Ot(r4, e) {
   let t = Array.isArray(r4) ? r4 : r4.entry?.map((n) => n.resource) ?? [];
   for (let n of t)
-    pi(n, e);
+    gi(n, e);
 }
-function pi(r4, e) {
+function gi(r4, e) {
   if (!r4?.name)
     throw new Error("Failed loading StructureDefinition from bundle");
   if (r4.resourceType !== "StructureDefinition")
     return;
-  let t = At(r4), n = wt(e);
-  n[r4.name] = t, e && r4.url === e && (Ct[e] = t);
+  let t = wt(r4), n = kt(e);
+  n[r4.name] = t, e && r4.url === e && (It[e] = t);
   for (let i2 of t.innerTypes)
     i2.parentType = t, n[i2.name] = i2;
 }
-function Dr(r4) {
-  return !!fe[r4];
+function Nr(r4) {
+  return !!me[r4];
 }
-function Nr(r4, e) {
-  return wt(e)[r4];
+function Le(r4, e) {
+  return kt(e)[r4];
 }
-function _r(r4) {
-  return !!Ct[r4];
+function Mr(r4) {
+  return !!It[r4];
 }
-var Rt = class {
+var Ct = class {
   constructor(e) {
     if (!e.snapshot?.element || e.snapshot.element.length === 0)
       throw new Error(`No snapshot defined for StructureDefinition '${e.name}'`);
-    this.root = e.snapshot.element[0], this.elements = e.snapshot.element.slice(1), this.elementIndex = /* @__PURE__ */ Object.create(null), this.index = 0, this.resourceSchema = { name: e.name, title: e.title, type: e.type, url: e.url, kind: e.kind, description: yi(e), elements: {}, constraints: this.parseElementDefinition(this.root).constraints, innerTypes: [], summaryProperties: /* @__PURE__ */ new Set(), mandatoryProperties: /* @__PURE__ */ new Set() }, this.innerTypes = [];
+    this.root = e.snapshot.element[0], this.elements = e.snapshot.element.slice(1), this.elementIndex = /* @__PURE__ */ Object.create(null), this.index = 0, this.resourceSchema = { name: e.name, title: e.title, type: e.type, url: e.url, kind: e.kind, description: vi(e), elements: {}, constraints: this.parseElementDefinition(this.root).constraints, innerTypes: [], summaryProperties: /* @__PURE__ */ new Set(), mandatoryProperties: /* @__PURE__ */ new Set() }, this.innerTypes = [];
   }
   parse() {
     let e = this.next();
@@ -39380,7 +39380,7 @@ var Rt = class {
         this.parseSliceStart(e);
       else if (e.id?.includes(":")) {
         if (this.slicingContext?.current) {
-          let t = bt(e, this.slicingContext.path);
+          let t = Pt(e, this.slicingContext.path);
           this.slicingContext.current.elements[t] = this.parseElementDefinition(e);
         }
       } else {
@@ -39389,13 +39389,13 @@ var Rt = class {
         let n = this.backboneContext;
         for (; n; ) {
           if (e.path?.startsWith(n.path + ".")) {
-            n.type.elements[bt(e, n.path)] = t;
+            n.type.elements[Pt(e, n.path)] = t;
             break;
           }
           n = n.parent;
         }
         if (!n) {
-          let i2 = bt(e, this.root.path);
+          let i2 = Pt(e, this.root.path);
           e.isSummary && this.resourceSchema.summaryProperties?.add(i2.replace("[x]", "")), t.min > 0 && this.resourceSchema.mandatoryProperties?.add(i2.replace("[x]", "")), this.resourceSchema.elements[i2] = t;
         }
         this.checkFieldExit(e);
@@ -39408,26 +39408,26 @@ var Rt = class {
     this.isInnerType(e) && this.enterInnerType(e), e.slicing && !this.slicingContext && this.enterSlice(e, t);
   }
   enterInnerType(e) {
-    for (; this.backboneContext && !ne(this.backboneContext?.path, e.path); )
+    for (; this.backboneContext && !oe(this.backboneContext?.path, e.path); )
       this.innerTypes.push(this.backboneContext.type), this.backboneContext = this.backboneContext.parent;
-    this.backboneContext = { type: { name: Pt(e), title: e.label, description: e.definition, elements: {}, constraints: this.parseElementDefinition(e).constraints, innerTypes: [] }, path: e.path ?? "", parent: ne(this.backboneContext?.path, e.path) ? this.backboneContext : this.backboneContext?.parent };
+    this.backboneContext = { type: { name: At(e), title: e.label, description: e.definition, elements: {}, constraints: this.parseElementDefinition(e).constraints, innerTypes: [] }, path: e.path ?? "", parent: oe(this.backboneContext?.path, e.path) ? this.backboneContext : this.backboneContext?.parent };
   }
   enterSlice(e, t) {
-    hi(e) && !this.peek()?.sliceName || (t.slicing = { discriminator: (e.slicing?.discriminator ?? []).map((n) => {
+    Ti(e) && !this.peek()?.sliceName || (t.slicing = { discriminator: (e.slicing?.discriminator ?? []).map((n) => {
       if (n.type !== "value" && n.type !== "pattern" && n.type !== "type")
         throw new Error(`Unsupported slicing discriminator type: ${n.type}`);
       return { path: n.path, type: n.type };
     }), slices: [], ordered: e.slicing?.ordered ?? false, rule: e.slicing?.rules }, this.slicingContext = { field: t.slicing, path: e.path ?? "" });
   }
   checkFieldExit(e = void 0) {
-    if (this.backboneContext && !ne(this.backboneContext.path, e?.path))
+    if (this.backboneContext && !oe(this.backboneContext.path, e?.path))
       if (this.backboneContext.parent)
         do
           this.innerTypes.push(this.backboneContext.type), this.backboneContext = this.backboneContext.parent;
-        while (this.backboneContext && !ne(this.backboneContext.path, e?.path));
+        while (this.backboneContext && !oe(this.backboneContext.path, e?.path));
       else
         this.innerTypes.push(this.backboneContext.type), delete this.backboneContext;
-    this.slicingContext && !ne(this.slicingContext.path, e?.path) && (this.slicingContext?.current && this.slicingContext.field.slices.push(this.slicingContext.current), delete this.slicingContext);
+    this.slicingContext && !oe(this.slicingContext.path, e?.path) && (this.slicingContext?.current && this.slicingContext.field.slices.push(this.slicingContext.current), delete this.slicingContext);
   }
   next() {
     let e = this.peek();
@@ -39446,7 +39446,7 @@ var Rt = class {
   }
   isInnerType(e) {
     let t = this.peek();
-    return !!(ne(e?.path, t?.path) && e.type?.some((n) => ["BackboneElement", "Element"].includes(n.code)));
+    return !!(oe(e?.path, t?.path) && e.type?.some((n) => ["BackboneElement", "Element"].includes(n.code)));
   }
   parseSliceStart(e) {
     if (!this.slicingContext)
@@ -39456,57 +39456,57 @@ var Rt = class {
   parseElementDefinitionType(e) {
     return (e.type ?? []).map((t) => {
       let n;
-      return (t.code === "BackboneElement" || t.code === "Element") && (n = Pt(e)), n || (n = ir(t, "http://hl7.org/fhir/StructureDefinition/structuredefinition-fhir-type")?.valueUrl), n || (n = t.code ?? ""), { code: n, targetProfile: t.targetProfile, profile: t.profile };
+      return (t.code === "BackboneElement" || t.code === "Element") && (n = At(e)), n || (n = pr(t, "http://hl7.org/fhir/StructureDefinition/structuredefinition-fhir-type")?.valueUrl), n || (n = t.code ?? ""), { code: n, targetProfile: t.targetProfile, profile: t.profile };
     });
   }
   parseElementDefinition(e) {
-    let t = kr(e.max), n = e.base?.max ? kr(e.base.max) : t, i2 = { type: "ElementDefinition", value: e };
-    return { description: e.definition || "", path: e.path || e.base?.path || "", min: e.min ?? 0, max: t, isArray: n > 1, constraints: (e.constraint ?? []).map((o) => ({ key: o.key ?? "", severity: o.severity ?? "error", expression: o.expression ?? "", description: o.human ?? "" })), type: this.parseElementDefinitionType(e), fixed: Or(A(i2, "fixed[x]")), pattern: Or(A(i2, "pattern[x]")), binding: e.binding };
+    let t = Or(e.max), n = e.base?.max ? Or(e.base.max) : t, i2 = { type: "ElementDefinition", value: e };
+    return { description: e.definition || "", path: e.path || e.base?.path || "", min: e.min ?? 0, max: t, isArray: n > 1, constraints: (e.constraint ?? []).map((o) => ({ key: o.key ?? "", severity: o.severity ?? "error", expression: o.expression ?? "", description: o.human ?? "" })), type: this.parseElementDefinitionType(e), fixed: Vr(A(i2, "fixed[x]")), pattern: Vr(A(i2, "pattern[x]")), binding: e.binding };
   }
 };
-function kr(r4) {
+function Or(r4) {
   return r4 === "*" ? Number.POSITIVE_INFINITY : Number.parseInt(r4, 10);
 }
-function bt(r4, e = "") {
-  return mi(r4.path, e);
+function Pt(r4, e = "") {
+  return xi(r4.path, e);
 }
-function mi(r4, e) {
+function xi(r4, e) {
   return r4 ? e && r4.startsWith(e) ? r4.substring(e.length + 1) : r4 : "";
 }
-function ne(r4, e) {
+function oe(r4, e) {
   return !r4 || !e ? false : e.startsWith(r4 + ".") || e === r4;
 }
-function Or(r4) {
-  return Array.isArray(r4) && r4.length > 0 ? r4[0] : E(r4) ? void 0 : r4;
+function Vr(r4) {
+  return Array.isArray(r4) && r4.length > 0 ? r4[0] : R(r4) ? void 0 : r4;
 }
-function hi(r4) {
+function Ti(r4) {
   let e = r4.slicing?.discriminator;
   return !!(r4.type?.some((t) => t.code === "Extension") && e?.length === 1 && e[0].type === "value" && e[0].path === "url");
 }
-function yi(r4) {
+function vi(r4) {
   let e = r4.description;
   return e?.startsWith(`Base StructureDefinition for ${r4.name} Type: `) && (e = e.substring(`Base StructureDefinition for ${r4.name} Type: `.length)), e;
 }
 var c = { Address: "Address", Age: "Age", Annotation: "Annotation", Attachment: "Attachment", BackboneElement: "BackboneElement", CodeableConcept: "CodeableConcept", Coding: "Coding", ContactDetail: "ContactDetail", ContactPoint: "ContactPoint", Contributor: "Contributor", Count: "Count", DataRequirement: "DataRequirement", Distance: "Distance", Dosage: "Dosage", Duration: "Duration", Expression: "Expression", Extension: "Extension", HumanName: "HumanName", Identifier: "Identifier", MarketingStatus: "MarketingStatus", Meta: "Meta", Money: "Money", Narrative: "Narrative", ParameterDefinition: "ParameterDefinition", Period: "Period", Population: "Population", ProdCharacteristic: "ProdCharacteristic", ProductShelfLife: "ProductShelfLife", Quantity: "Quantity", Range: "Range", Ratio: "Ratio", Reference: "Reference", RelatedArtifact: "RelatedArtifact", SampledData: "SampledData", Signature: "Signature", SubstanceAmount: "SubstanceAmount", SystemString: "http://hl7.org/fhirpath/System.String", Timing: "Timing", TriggerDefinition: "TriggerDefinition", UsageContext: "UsageContext", base64Binary: "base64Binary", boolean: "boolean", canonical: "canonical", code: "code", date: "date", dateTime: "dateTime", decimal: "decimal", id: "id", instant: "instant", integer: "integer", markdown: "markdown", oid: "oid", positiveInt: "positiveInt", string: "string", time: "time", unsignedInt: "unsignedInt", uri: "uri", url: "url", uuid: "uuid" };
-function Ot(r4) {
+function Dt(r4) {
   for (let e of r4.base ?? []) {
-    let t = D.types[e];
-    t || (t = { searchParamsDetails: {} }, D.types[e] = t), t.searchParams || (t.searchParams = { _id: { base: [e], code: "_id", type: "token", expression: e + ".id" }, _lastUpdated: { base: [e], code: "_lastUpdated", type: "date", expression: e + ".meta.lastUpdated" }, _compartment: { base: [e], code: "_compartment", type: "reference", expression: e + ".meta.compartment" }, _profile: { base: [e], code: "_profile", type: "uri", expression: e + ".meta.profile" }, _security: { base: [e], code: "_security", type: "token", expression: e + ".meta.security" }, _source: { base: [e], code: "_source", type: "uri", expression: e + ".meta.source" }, _tag: { base: [e], code: "_tag", type: "token", expression: e + ".meta.tag" } }), t.searchParams[r4.code] = r4;
+    let t = N.types[e];
+    t || (t = { searchParamsDetails: {} }, N.types[e] = t), t.searchParams || (t.searchParams = { _id: { base: [e], code: "_id", type: "token", expression: e + ".id" }, _lastUpdated: { base: [e], code: "_lastUpdated", type: "date", expression: e + ".meta.lastUpdated" }, _compartment: { base: [e], code: "_compartment", type: "reference", expression: e + ".meta.compartment" }, _profile: { base: [e], code: "_profile", type: "uri", expression: e + ".meta.profile" }, _security: { base: [e], code: "_security", type: "token", expression: e + ".meta.security" }, _source: { base: [e], code: "_source", type: "uri", expression: e + ".meta.source" }, _tag: { base: [e], code: "_tag", type: "token", expression: e + ".meta.tag" } }), t.searchParams[r4.code] = r4;
   }
 }
-function Pt(r4) {
+function At(r4) {
   let e = r4.type?.[0]?.code;
-  return e === "BackboneElement" || e === "Element" ? gi((r4.base?.path ?? r4.path)?.split(".")) : e;
+  return e === "BackboneElement" || e === "Element" ? Si((r4.base?.path ?? r4.path)?.split(".")) : e;
 }
-function gi(r4) {
-  return r4.length === 1 ? r4[0] : r4.map(w).join("");
+function Si(r4) {
+  return r4.length === 1 ? r4[0] : r4.map(I).join("");
 }
-function Ve(r4, e) {
-  let t = Nr(r4);
+function _e(r4, e) {
+  let t = Le(r4);
   if (t)
-    return Si(t.elements, e);
+    return Pi(t.elements, e);
 }
-function Si(r4, e) {
+function Pi(r4, e) {
   let t = r4[e] ?? r4[e + "[x]"];
   if (t)
     return t;
@@ -39519,14 +39519,14 @@ function Si(r4, e) {
     }
   }
 }
-function M(r4) {
+function _(r4) {
   return !!(r4 && typeof r4 == "object" && "resourceType" in r4);
 }
-function pe(r4) {
+function fe(r4) {
   return !!(r4 && typeof r4 == "object" && "reference" in r4);
 }
-var D = { types: {} };
-function oe(r4) {
+var N = { types: {} };
+function ae(r4) {
   if (r4.startsWith("T"))
     return r4 + "T00:00:00.000Z".substring(r4.length);
   if (r4.length <= 10)
@@ -39537,33 +39537,33 @@ function oe(r4) {
     return r4;
   }
 }
-var me = () => [];
-var S = { empty: (r4, e) => d(e.length === 0), exists: (r4, e, t) => t ? d(e.filter((n) => V(t.eval(r4, [n]))).length > 0) : d(e.length > 0), all: (r4, e, t) => d(e.every((n) => V(t.eval(r4, [n])))), allTrue: (r4, e) => {
+var he = () => [];
+var b = { empty: (r4, e) => p(e.length === 0), exists: (r4, e, t) => t ? p(e.filter((n) => D(t.eval(r4, [n]))).length > 0) : p(e.length > 0), all: (r4, e, t) => p(e.every((n) => D(t.eval(r4, [n])))), allTrue: (r4, e) => {
   for (let t of e)
     if (!t.value)
-      return d(false);
-  return d(true);
+      return p(false);
+  return p(true);
 }, anyTrue: (r4, e) => {
   for (let t of e)
     if (t.value)
-      return d(true);
-  return d(false);
+      return p(true);
+  return p(false);
 }, allFalse: (r4, e) => {
   for (let t of e)
     if (t.value)
-      return d(false);
-  return d(true);
+      return p(false);
+  return p(true);
 }, anyFalse: (r4, e) => {
   for (let t of e)
     if (!t.value)
-      return d(true);
-  return d(false);
-}, subsetOf: me, supersetOf: me, count: (r4, e) => [{ type: c.integer, value: e.length }], distinct: (r4, e) => {
+      return p(true);
+  return p(false);
+}, subsetOf: he, supersetOf: he, count: (r4, e) => [{ type: c.integer, value: e.length }], distinct: (r4, e) => {
   let t = [];
   for (let n of e)
     t.some((i2) => i2.value === n.value) || t.push(n);
   return t;
-}, isDistinct: (r4, e) => d(e.length === S.distinct(r4, e).length), where: (r4, e, t) => e.filter((n) => V(t.eval(r4, [n]))), select: (r4, e, t) => e.map((n) => t.eval(r4, [n])).flat(), repeat: me, ofType: (r4, e, t) => e.filter((n) => n.type === t.name), single: (r4, e) => {
+}, isDistinct: (r4, e) => p(e.length === b.distinct(r4, e).length), where: (r4, e, t) => e.filter((n) => D(t.eval(r4, [n]))), select: (r4, e, t) => e.map((n) => t.eval(r4, [n])).flat(), repeat: he, ofType: (r4, e, t) => e.filter((n) => n.type === t.name), single: (r4, e) => {
   if (e.length > 1)
     throw new Error("Expected input length one for single()");
   return e.length === 0 ? [] : e.slice(0, 1);
@@ -39595,17 +39595,17 @@ var S = { empty: (r4, e) => d(e.length === 0), exists: (r4, e, t) => t ? d(e.fil
   if (!t)
     return e;
   let n = t.eval(r4, e);
-  return ke([...e, ...n]);
+  return Fe([...e, ...n]);
 }, combine: (r4, e, t) => {
   if (!t)
     return e;
   let n = t.eval(r4, e);
   return [...e, ...n];
-}, htmlChecks: (r4, e, t) => [g(true)], iif: (r4, e, t, n, i2) => {
+}, htmlChecks: (r4, e, t) => [y(true)], iif: (r4, e, t, n, i2) => {
   let o = t.eval(r4, e);
   if (o.length > 1 || o.length === 1 && typeof o[0].value != "boolean")
     throw new Error("Expected criterion to evaluate to a Boolean");
-  return V(o) ? n.eval(r4, e) : i2 ? i2.eval(r4, e) : [];
+  return D(o) ? n.eval(r4, e) : i2 ? i2.eval(r4, e) : [];
 }, toBoolean: (r4, e) => {
   if (e.length === 0)
     return [];
@@ -39613,81 +39613,81 @@ var S = { empty: (r4, e) => d(e.length === 0), exists: (r4, e, t) => t ? d(e.fil
   if (typeof t == "boolean")
     return [{ type: c.boolean, value: t }];
   if (typeof t == "number" && (t === 0 || t === 1))
-    return d(!!t);
+    return p(!!t);
   if (typeof t == "string") {
     let n = t.toLowerCase();
     if (["true", "t", "yes", "y", "1", "1.0"].includes(n))
-      return d(true);
+      return p(true);
     if (["false", "f", "no", "n", "0", "0.0"].includes(n))
-      return d(false);
+      return p(false);
   }
   return [];
-}, convertsToBoolean: (r4, e) => e.length === 0 ? [] : d(S.toBoolean(r4, e).length === 1), toInteger: (r4, e) => {
+}, convertsToBoolean: (r4, e) => e.length === 0 ? [] : p(b.toBoolean(r4, e).length === 1), toInteger: (r4, e) => {
   if (e.length === 0)
     return [];
   let [{ value: t }] = U(e, 1);
   return typeof t == "number" ? [{ type: c.integer, value: t }] : typeof t == "string" && /^[+-]?\d+$/.exec(t) ? [{ type: c.integer, value: parseInt(t, 10) }] : typeof t == "boolean" ? [{ type: c.integer, value: t ? 1 : 0 }] : [];
-}, convertsToInteger: (r4, e) => e.length === 0 ? [] : d(S.toInteger(r4, e).length === 1), toDate: (r4, e) => {
+}, convertsToInteger: (r4, e) => e.length === 0 ? [] : p(b.toInteger(r4, e).length === 1), toDate: (r4, e) => {
   if (e.length === 0)
     return [];
   let [{ value: t }] = U(e, 1);
-  return typeof t == "string" && /^\d{4}(-\d{2}(-\d{2})?)?/.exec(t) ? [{ type: c.date, value: oe(t) }] : [];
-}, convertsToDate: (r4, e) => e.length === 0 ? [] : d(S.toDate(r4, e).length === 1), toDateTime: (r4, e) => {
+  return typeof t == "string" && /^\d{4}(-\d{2}(-\d{2})?)?/.exec(t) ? [{ type: c.date, value: ae(t) }] : [];
+}, convertsToDate: (r4, e) => e.length === 0 ? [] : p(b.toDate(r4, e).length === 1), toDateTime: (r4, e) => {
   if (e.length === 0)
     return [];
   let [{ value: t }] = U(e, 1);
-  return typeof t == "string" && /^\d{4}(-\d{2}(-\d{2})?)?/.exec(t) ? [{ type: c.dateTime, value: oe(t) }] : [];
-}, convertsToDateTime: (r4, e) => e.length === 0 ? [] : d(S.toDateTime(r4, e).length === 1), toDecimal: (r4, e) => {
+  return typeof t == "string" && /^\d{4}(-\d{2}(-\d{2})?)?/.exec(t) ? [{ type: c.dateTime, value: ae(t) }] : [];
+}, convertsToDateTime: (r4, e) => e.length === 0 ? [] : p(b.toDateTime(r4, e).length === 1), toDecimal: (r4, e) => {
   if (e.length === 0)
     return [];
   let [{ value: t }] = U(e, 1);
   return typeof t == "number" ? [{ type: c.decimal, value: t }] : typeof t == "string" && /^-?\d{1,9}(\.\d{1,9})?$/.exec(t) ? [{ type: c.decimal, value: parseFloat(t) }] : typeof t == "boolean" ? [{ type: c.decimal, value: t ? 1 : 0 }] : [];
-}, convertsToDecimal: (r4, e) => e.length === 0 ? [] : d(S.toDecimal(r4, e).length === 1), toQuantity: (r4, e) => {
+}, convertsToDecimal: (r4, e) => e.length === 0 ? [] : p(b.toDecimal(r4, e).length === 1), toQuantity: (r4, e) => {
   if (e.length === 0)
     return [];
   let [{ value: t }] = U(e, 1);
-  return b(t) ? [{ type: c.Quantity, value: t }] : typeof t == "number" ? [{ type: c.Quantity, value: { value: t, unit: "1" } }] : typeof t == "string" && /^-?\d{1,9}(\.\d{1,9})?/.exec(t) ? [{ type: c.Quantity, value: { value: parseFloat(t), unit: "1" } }] : typeof t == "boolean" ? [{ type: c.Quantity, value: { value: t ? 1 : 0, unit: "1" } }] : [];
-}, convertsToQuantity: (r4, e) => e.length === 0 ? [] : d(S.toQuantity(r4, e).length === 1), toString: (r4, e) => {
+  return P(t) ? [{ type: c.Quantity, value: t }] : typeof t == "number" ? [{ type: c.Quantity, value: { value: t, unit: "1" } }] : typeof t == "string" && /^-?\d{1,9}(\.\d{1,9})?/.exec(t) ? [{ type: c.Quantity, value: { value: parseFloat(t), unit: "1" } }] : typeof t == "boolean" ? [{ type: c.Quantity, value: { value: t ? 1 : 0, unit: "1" } }] : [];
+}, convertsToQuantity: (r4, e) => e.length === 0 ? [] : p(b.toQuantity(r4, e).length === 1), toString: (r4, e) => {
   if (e.length === 0)
     return [];
   let [{ value: t }] = U(e, 1);
-  return t == null ? [] : b(t) ? [{ type: c.string, value: `${t.value} '${t.unit}'` }] : [{ type: c.string, value: t.toString() }];
-}, convertsToString: (r4, e) => e.length === 0 ? [] : d(S.toString(r4, e).length === 1), toTime: (r4, e) => {
+  return t == null ? [] : P(t) ? [{ type: c.string, value: `${t.value} '${t.unit}'` }] : [{ type: c.string, value: t.toString() }];
+}, convertsToString: (r4, e) => e.length === 0 ? [] : p(b.toString(r4, e).length === 1), toTime: (r4, e) => {
   if (e.length === 0)
     return [];
   let [{ value: t }] = U(e, 1);
   if (typeof t == "string") {
     let n = /^T?(\d{2}(:\d{2}(:\d{2})?)?)/.exec(t);
     if (n)
-      return [{ type: c.time, value: oe("T" + n[1]) }];
+      return [{ type: c.time, value: ae("T" + n[1]) }];
   }
   return [];
-}, convertsToTime: (r4, e) => e.length === 0 ? [] : d(S.toTime(r4, e).length === 1), indexOf: (r4, e, t) => k((n, i2) => n.indexOf(i2), r4, e, t), substring: (r4, e, t, n) => k((i2, o, s) => {
+}, convertsToTime: (r4, e) => e.length === 0 ? [] : p(b.toTime(r4, e).length === 1), indexOf: (r4, e, t) => k((n, i2) => n.indexOf(i2), r4, e, t), substring: (r4, e, t, n) => k((i2, o, s) => {
   let a = o, u2 = s ? a + s : i2.length;
   return a < 0 || a >= i2.length ? void 0 : i2.substring(a, u2);
-}, r4, e, t, n), startsWith: (r4, e, t) => k((n, i2) => n.startsWith(i2), r4, e, t), endsWith: (r4, e, t) => k((n, i2) => n.endsWith(i2), r4, e, t), contains: (r4, e, t) => k((n, i2) => n.includes(i2), r4, e, t), upper: (r4, e) => k((t) => t.toUpperCase(), r4, e), lower: (r4, e) => k((t) => t.toLowerCase(), r4, e), replace: (r4, e, t, n) => k((i2, o, s) => i2.replaceAll(o, s), r4, e, t, n), matches: (r4, e, t) => k((n, i2) => !!new RegExp(i2).exec(n), r4, e, t), replaceMatches: (r4, e, t, n) => k((i2, o, s) => i2.replaceAll(o, s), r4, e, t, n), length: (r4, e) => k((t) => t.length, r4, e), toChars: (r4, e) => k((t) => t ? t.split("") : void 0, r4, e), abs: (r4, e) => L(Math.abs, r4, e), ceiling: (r4, e) => L(Math.ceil, r4, e), exp: (r4, e) => L(Math.exp, r4, e), floor: (r4, e) => L(Math.floor, r4, e), ln: (r4, e) => L(Math.log, r4, e), log: (r4, e, t) => L((n, i2) => Math.log(n) / Math.log(i2), r4, e, t), power: (r4, e, t) => L(Math.pow, r4, e, t), round: (r4, e) => L(Math.round, r4, e), sqrt: (r4, e) => L(Math.sqrt, r4, e), truncate: (r4, e) => L((t) => t | 0, r4, e), children: me, descendants: me, trace: (r4, e, t) => (console.log("trace", e, t), e), now: () => [{ type: c.dateTime, value: (/* @__PURE__ */ new Date()).toISOString() }], timeOfDay: () => [{ type: c.time, value: (/* @__PURE__ */ new Date()).toISOString().substring(11) }], today: () => [{ type: c.date, value: (/* @__PURE__ */ new Date()).toISOString().substring(0, 10) }], between: (r4, e, t, n, i2) => {
-  let o = S.toDateTime(r4, t.eval(r4, e));
+}, r4, e, t, n), startsWith: (r4, e, t) => k((n, i2) => n.startsWith(i2), r4, e, t), endsWith: (r4, e, t) => k((n, i2) => n.endsWith(i2), r4, e, t), contains: (r4, e, t) => k((n, i2) => n.includes(i2), r4, e, t), upper: (r4, e) => k((t) => t.toUpperCase(), r4, e), lower: (r4, e) => k((t) => t.toLowerCase(), r4, e), replace: (r4, e, t, n) => k((i2, o, s) => i2.replaceAll(o, s), r4, e, t, n), matches: (r4, e, t) => k((n, i2) => !!new RegExp(i2).exec(n), r4, e, t), replaceMatches: (r4, e, t, n) => k((i2, o, s) => i2.replaceAll(o, s), r4, e, t, n), length: (r4, e) => k((t) => t.length, r4, e), toChars: (r4, e) => k((t) => t ? t.split("") : void 0, r4, e), abs: (r4, e) => L(Math.abs, r4, e), ceiling: (r4, e) => L(Math.ceil, r4, e), exp: (r4, e) => L(Math.exp, r4, e), floor: (r4, e) => L(Math.floor, r4, e), ln: (r4, e) => L(Math.log, r4, e), log: (r4, e, t) => L((n, i2) => Math.log(n) / Math.log(i2), r4, e, t), power: (r4, e, t) => L(Math.pow, r4, e, t), round: (r4, e) => L(Math.round, r4, e), sqrt: (r4, e) => L(Math.sqrt, r4, e), truncate: (r4, e) => L((t) => t | 0, r4, e), children: he, descendants: he, trace: (r4, e, t) => (console.log("trace", e, t), e), now: () => [{ type: c.dateTime, value: (/* @__PURE__ */ new Date()).toISOString() }], timeOfDay: () => [{ type: c.time, value: (/* @__PURE__ */ new Date()).toISOString().substring(11) }], today: () => [{ type: c.date, value: (/* @__PURE__ */ new Date()).toISOString().substring(0, 10) }], between: (r4, e, t, n, i2) => {
+  let o = b.toDateTime(r4, t.eval(r4, e));
   if (o.length === 0)
     throw new Error("Invalid start date");
-  let s = S.toDateTime(r4, n.eval(r4, e));
+  let s = b.toDateTime(r4, n.eval(r4, e));
   if (s.length === 0)
     throw new Error("Invalid end date");
   let a = i2.eval(r4, e)[0]?.value;
   if (a !== "years" && a !== "months" && a !== "days")
     throw new Error("Invalid units");
-  let u2 = Re(o[0].value, s[0].value);
+  let u2 = Ie(o[0].value, s[0].value);
   return [{ type: c.Quantity, value: { value: u2[a], unit: a } }];
 }, is: (r4, e, t) => {
   let n = "";
-  return t instanceof q ? n = t.name : t instanceof H && (n = t.left.name + "." + t.right.name), n ? e.map((i2) => ({ type: c.boolean, value: Oe(i2, n) })) : [];
-}, not: (r4, e) => S.toBoolean(r4, e).map((t) => ({ type: c.boolean, value: !t.value })), resolve: (r4, e) => e.map((t) => {
+  return t instanceof B ? n = t.name : t instanceof G && (n = t.left.name + "." + t.right.name), n ? e.map((i2) => ({ type: c.boolean, value: Me(i2, n) })) : [];
+}, not: (r4, e) => b.toBoolean(r4, e).map((t) => ({ type: c.boolean, value: !t.value })), resolve: (r4, e) => e.map((t) => {
   let n = t.value, i2;
   if (typeof n == "string")
     i2 = n;
   else if (typeof n == "object") {
     let o = n;
     if (o.resource)
-      return g(o.resource);
+      return y(o.resource);
     o.reference ? i2 = o.reference : o.type && o.identifier && (i2 = `${o.type}?identifier=${o.identifier.system}|${o.identifier.value}`);
   }
   if (i2?.includes("?")) {
@@ -39699,7 +39699,7 @@ var S = { empty: (r4, e) => d(e.length === 0), exists: (r4, e, t) => t ? d(e.fil
     return { type: o, value: { resourceType: o, id: s } };
   }
   return { type: c.BackboneElement, value: void 0 };
-}).filter((t) => !!t.value), as: (r4, e) => e, type: (r4, e) => e.map(({ value: t }) => typeof t == "boolean" ? { type: c.BackboneElement, value: { namespace: "System", name: "Boolean" } } : typeof t == "number" ? { type: c.BackboneElement, value: { namespace: "System", name: "Integer" } } : M(t) ? { type: c.BackboneElement, value: { namespace: "FHIR", name: t.resourceType } } : { type: c.BackboneElement, value: null }), conformsTo: (r4, e, t) => {
+}).filter((t) => !!t.value), as: (r4, e) => e, type: (r4, e) => e.map(({ value: t }) => typeof t == "boolean" ? { type: c.BackboneElement, value: { namespace: "System", name: "Boolean" } } : typeof t == "number" ? { type: c.BackboneElement, value: { namespace: "System", name: "Integer" } } : _(t) ? { type: c.BackboneElement, value: { namespace: "FHIR", name: t.resourceType } } : { type: c.BackboneElement, value: null }), conformsTo: (r4, e, t) => {
   let n = t.eval(r4, e)[0].value;
   if (!n.startsWith("http://hl7.org/fhir/StructureDefinition/"))
     throw new Error("Expected a StructureDefinition URL");
@@ -39713,12 +39713,12 @@ function k(r4, e, t, ...n) {
   if (typeof i2 != "string")
     throw new Error("String function cannot be called with non-string");
   let o = r4(i2, ...n.map((s) => s?.eval(e, t)[0]?.value));
-  return o === void 0 ? [] : Array.isArray(o) ? o.map(g) : [g(o)];
+  return o === void 0 ? [] : Array.isArray(o) ? o.map(y) : [y(o)];
 }
 function L(r4, e, t, ...n) {
   if (t.length === 0)
     return [];
-  let [{ value: i2 }] = U(t, 1), o = b(i2), s = o ? i2.value : i2;
+  let [{ value: i2 }] = U(t, 1), o = P(i2), s = o ? i2.value : i2;
   if (typeof s != "number")
     throw new Error("Math function cannot be called with non-number");
   let a = r4(s, ...n.map((f) => f.eval(e, t)[0]?.value)), u2 = o ? c.Quantity : t[0].type, l2 = o ? { ...i2, value: a } : a;
@@ -39732,7 +39732,7 @@ function U(r4, e) {
       throw new Error("Expected non-null argument");
   return r4;
 }
-var N = class {
+var O = class {
   constructor(e) {
     this.value = e;
   }
@@ -39744,31 +39744,30 @@ var N = class {
     return typeof e == "string" ? `'${e}'` : e.toString();
   }
 };
-var q = class {
+var B = class {
   constructor(e) {
     this.name = e;
   }
   eval(e, t) {
     if (this.name === "$this")
       return t;
-    if (this.name.startsWith("%")) {
-      let n = e.variables[this.name.slice(1)];
-      if (!n)
-        throw new Error(`Undefined variable ${this.name}`);
+    let n = e.variables[this.name];
+    if (n)
       return [n];
-    }
-    return t.flatMap((n) => this.evalValue(n)).filter((n) => n?.value !== void 0);
+    if (this.name.startsWith("%"))
+      throw new Error(`Undefined variable ${this.name}`);
+    return t.flatMap((i2) => this.evalValue(i2)).filter((i2) => i2?.value !== void 0);
   }
   evalValue(e) {
     let t = e.value;
     if (!(!t || typeof t != "object"))
-      return M(t) && t.resourceType === this.name ? e : A(e, this.name);
+      return _(t) && t.resourceType === this.name ? e : A(e, this.name);
   }
   toString() {
     return this.name;
   }
 };
-var Le = class {
+var Be = class {
   eval() {
     return [];
   }
@@ -39776,7 +39775,7 @@ var Le = class {
     return "{}";
   }
 };
-var Ue = class extends Ee {
+var qe = class extends Re {
   constructor(t, n, i2) {
     super(t, n);
     this.impl = i2;
@@ -39788,17 +39787,17 @@ var Ue = class extends Ee {
     return this.operator + this.child.toString();
   }
 };
-var Y = class extends j {
+var X = class extends Q {
   constructor(e, t) {
     super("as", e, t);
   }
   eval(e, t) {
-    return S.ofType(e, this.left.eval(e, t), this.right);
+    return b.ofType(e, this.left.eval(e, t), this.right);
   }
 };
-var v = class extends j {
+var S = class extends Q {
 };
-var R = class extends v {
+var C = class extends S {
   constructor(t, n, i2, o) {
     super(t, n, i2);
     this.impl = o;
@@ -39810,11 +39809,11 @@ var R = class extends v {
     let o = this.right.eval(t, n);
     if (o.length !== 1)
       return [];
-    let s = i2[0].value, a = o[0].value, u2 = b(s) ? s.value : s, l2 = b(a) ? a.value : a, f = this.impl(u2, l2);
-    return typeof f == "boolean" ? d(f) : b(s) ? [{ type: c.Quantity, value: { ...s, value: f } }] : [g(f)];
+    let s = i2[0].value, a = o[0].value, u2 = P(s) ? s.value : s, l2 = P(a) ? a.value : a, f = this.impl(u2, l2);
+    return typeof f == "boolean" ? p(f) : P(s) ? [{ type: c.Quantity, value: { ...s, value: f } }] : [y(f)];
   }
 };
-var Be = class extends j {
+var je = class extends Q {
   constructor(e, t) {
     super("&", e, t);
   }
@@ -39823,25 +39822,25 @@ var Be = class extends j {
     return o.length > 0 && o.every((s) => typeof s.value == "string") ? [{ type: c.string, value: o.map((s) => s.value).join("") }] : o;
   }
 };
-var qe = class extends v {
+var $e = class extends S {
   constructor(e, t) {
     super("contains", e, t);
   }
   eval(e, t) {
     let n = this.left.eval(e, t), i2 = this.right.eval(e, t);
-    return d(n.some((o) => o.value === i2[0].value));
+    return p(n.some((o) => o.value === i2[0].value));
   }
 };
-var $e = class extends v {
+var Qe = class extends S {
   constructor(e, t) {
     super("in", e, t);
   }
   eval(e, t) {
-    let n = _(this.left.eval(e, t)), i2 = this.right.eval(e, t);
-    return n ? d(i2.some((o) => o.value === n.value)) : [];
+    let n = M(this.left.eval(e, t)), i2 = this.right.eval(e, t);
+    return n ? p(i2.some((o) => o.value === n.value)) : [];
   }
 };
-var H = class extends j {
+var G = class extends Q {
   constructor(e, t) {
     super(".", e, t);
   }
@@ -39852,52 +39851,52 @@ var H = class extends j {
     return `${this.left.toString()}.${this.right.toString()}`;
   }
 };
-var se = class extends j {
+var ce = class extends Q {
   constructor(e, t) {
     super("|", e, t);
   }
   eval(e, t) {
     let n = this.left.eval(e, t), i2 = this.right.eval(e, t);
-    return ke([...n, ...i2]);
+    return Fe([...n, ...i2]);
   }
 };
-var je = class extends v {
+var He = class extends S {
   constructor(e, t) {
     super("=", e, t);
   }
   eval(e, t) {
     let n = this.left.eval(e, t), i2 = this.right.eval(e, t);
-    return mt(n, i2);
+    return Et(n, i2);
   }
 };
-var Qe = class extends v {
+var Ge = class extends S {
   constructor(e, t) {
     super("!=", e, t);
   }
   eval(e, t) {
     let n = this.left.eval(e, t), i2 = this.right.eval(e, t);
-    return ft(mt(n, i2));
+    return St(Et(n, i2));
   }
 };
-var He = class extends v {
+var Ke = class extends S {
   constructor(e, t) {
     super("~", e, t);
   }
   eval(e, t) {
     let n = this.left.eval(e, t), i2 = this.right.eval(e, t);
-    return ht(n, i2);
+    return bt(n, i2);
   }
 };
-var Ge = class extends v {
+var We = class extends S {
   constructor(e, t) {
     super("!~", e, t);
   }
   eval(e, t) {
     let n = this.left.eval(e, t), i2 = this.right.eval(e, t);
-    return ft(ht(n, i2));
+    return St(bt(n, i2));
   }
 };
-var X = class extends v {
+var Z = class extends S {
   constructor(e, t) {
     super("is", e, t);
   }
@@ -39906,52 +39905,52 @@ var X = class extends v {
     if (n.length !== 1)
       return [];
     let i2 = this.right.name;
-    return d(Oe(n[0], i2));
+    return p(Me(n[0], i2));
   }
 };
-var Ke = class extends v {
+var ze = class extends S {
   constructor(e, t) {
     super("and", e, t);
   }
   eval(e, t) {
-    let n = _(this.left.eval(e, t), "boolean"), i2 = _(this.right.eval(e, t), "boolean");
-    return n?.value === true && i2?.value === true ? d(true) : n?.value === false || i2?.value === false ? d(false) : [];
+    let n = M(this.left.eval(e, t), "boolean"), i2 = M(this.right.eval(e, t), "boolean");
+    return n?.value === true && i2?.value === true ? p(true) : n?.value === false || i2?.value === false ? p(false) : [];
   }
 };
-var We = class extends v {
+var Je = class extends S {
   constructor(e, t) {
     super("or", e, t);
   }
   eval(e, t) {
-    let n = _(this.left.eval(e, t), "boolean"), i2 = _(this.right.eval(e, t), "boolean");
-    return n?.value === false && i2?.value === false ? d(false) : n?.value || i2?.value ? d(true) : [];
+    let n = M(this.left.eval(e, t), "boolean"), i2 = M(this.right.eval(e, t), "boolean");
+    return n?.value === false && i2?.value === false ? p(false) : n?.value || i2?.value ? p(true) : [];
   }
 };
-var ze = class extends v {
+var Ye = class extends S {
   constructor(e, t) {
     super("xor", e, t);
   }
   eval(e, t) {
-    let n = _(this.left.eval(e, t), "boolean"), i2 = _(this.right.eval(e, t), "boolean");
-    return !n || !i2 ? [] : d(n.value !== i2.value);
+    let n = M(this.left.eval(e, t), "boolean"), i2 = M(this.right.eval(e, t), "boolean");
+    return !n || !i2 ? [] : p(n.value !== i2.value);
   }
 };
-var Je = class extends v {
+var Xe = class extends S {
   constructor(e, t) {
     super("implies", e, t);
   }
   eval(e, t) {
-    let n = _(this.left.eval(e, t), "boolean"), i2 = _(this.right.eval(e, t), "boolean");
-    return i2?.value === true || n?.value === false ? d(true) : !n || !i2 ? [] : d(false);
+    let n = M(this.left.eval(e, t), "boolean"), i2 = M(this.right.eval(e, t), "boolean");
+    return i2?.value === true || n?.value === false ? p(true) : !n || !i2 ? [] : p(false);
   }
 };
-var $ = class {
+var j = class {
   constructor(e, t) {
     this.name = e;
     this.args = t;
   }
   eval(e, t) {
-    let n = S[this.name];
+    let n = b[this.name];
     if (!n)
       throw new Error("Unrecognized function: " + this.name);
     return n(e, t, ...this.args);
@@ -39960,7 +39959,7 @@ var $ = class {
     return `${this.name}(${this.args.map((e) => e.toString()).join(", ")})`;
   }
 };
-var Z = class {
+var ee = class {
   constructor(e, t) {
     this.left = e;
     this.expr = t;
@@ -39981,37 +39980,37 @@ var Z = class {
 };
 var ye = ["!=", "!~", "<=", ">=", "{}", "->"];
 var m = { FunctionCall: 0, Dot: 1, Indexer: 2, UnaryAdd: 3, UnarySubtract: 3, Multiply: 4, Divide: 4, IntegerDivide: 4, Modulo: 4, Add: 5, Subtract: 5, Ampersand: 5, Is: 6, As: 6, Union: 7, GreaterThan: 8, GreaterThanOrEquals: 8, LessThan: 8, LessThanOrEquals: 8, Equals: 9, Equivalent: 9, NotEquals: 9, NotEquivalent: 9, In: 10, Contains: 10, And: 11, Xor: 12, Or: 12, Implies: 13, Arrow: 100, Semicolon: 200 };
-var Ri = { parse(r4) {
+var wi = { parse(r4) {
   let e = r4.consumeAndParse();
   if (!r4.match(")"))
     throw new Error("Parse error: expected `)` got `" + r4.peek()?.value + "`");
   return e;
 } };
-var Pi = { parse(r4, e) {
+var Ii = { parse(r4, e) {
   let t = r4.consumeAndParse();
   if (!r4.match("]"))
     throw new Error("Parse error: expected `]`");
-  return new Z(e, t);
+  return new ee(e, t);
 }, precedence: m.Indexer };
-var Ai = { parse(r4, e) {
-  if (!(e instanceof q))
+var ki = { parse(r4, e) {
+  if (!(e instanceof B))
     throw new Error("Unexpected parentheses");
   let t = [];
   for (; !r4.match(")"); )
     t.push(r4.consumeAndParse()), r4.match(",");
-  return new $(e.name, t);
+  return new j(e.name, t);
 }, precedence: m.FunctionCall };
-function Ci(r4) {
+function Oi(r4) {
   let e = r4.split(" "), t = parseFloat(e[0]), n = e[1];
   return n?.startsWith("'") && n.endsWith("'") ? n = n.substring(1, n.length - 1) : n = "{" + n + "}", { value: t, unit: n };
 }
-function ge() {
-  return new be().registerPrefix("String", { parse: (r4, e) => new N({ type: c.string, value: e.value }) }).registerPrefix("DateTime", { parse: (r4, e) => new N({ type: c.dateTime, value: oe(e.value) }) }).registerPrefix("Quantity", { parse: (r4, e) => new N({ type: c.Quantity, value: Ci(e.value) }) }).registerPrefix("Number", { parse: (r4, e) => new N({ type: e.value.includes(".") ? c.decimal : c.integer, value: parseFloat(e.value) }) }).registerPrefix("true", { parse: () => new N({ type: c.boolean, value: true }) }).registerPrefix("false", { parse: () => new N({ type: c.boolean, value: false }) }).registerPrefix("Symbol", { parse: (r4, e) => new q(e.value) }).registerPrefix("{}", { parse: () => new Le() }).registerPrefix("(", Ri).registerInfix("[", Pi).registerInfix("(", Ai).prefix("+", m.UnaryAdd, (r4, e) => new Ue("+", e, (t) => t)).prefix("-", m.UnarySubtract, (r4, e) => new R("-", e, e, (t, n) => -n)).infixLeft(".", m.Dot, (r4, e, t) => new H(r4, t)).infixLeft("/", m.Divide, (r4, e, t) => new R("/", r4, t, (n, i2) => n / i2)).infixLeft("*", m.Multiply, (r4, e, t) => new R("*", r4, t, (n, i2) => n * i2)).infixLeft("+", m.Add, (r4, e, t) => new R("+", r4, t, (n, i2) => n + i2)).infixLeft("-", m.Subtract, (r4, e, t) => new R("-", r4, t, (n, i2) => n - i2)).infixLeft("|", m.Union, (r4, e, t) => new se(r4, t)).infixLeft("=", m.Equals, (r4, e, t) => new je(r4, t)).infixLeft("!=", m.NotEquals, (r4, e, t) => new Qe(r4, t)).infixLeft("~", m.Equivalent, (r4, e, t) => new He(r4, t)).infixLeft("!~", m.NotEquivalent, (r4, e, t) => new Ge(r4, t)).infixLeft("<", m.LessThan, (r4, e, t) => new R("<", r4, t, (n, i2) => n < i2)).infixLeft("<=", m.LessThanOrEquals, (r4, e, t) => new R("<=", r4, t, (n, i2) => n <= i2)).infixLeft(">", m.GreaterThan, (r4, e, t) => new R(">", r4, t, (n, i2) => n > i2)).infixLeft(">=", m.GreaterThanOrEquals, (r4, e, t) => new R(">=", r4, t, (n, i2) => n >= i2)).infixLeft("&", m.Ampersand, (r4, e, t) => new Be(r4, t)).infixLeft("and", m.And, (r4, e, t) => new Ke(r4, t)).infixLeft("as", m.As, (r4, e, t) => new Y(r4, t)).infixLeft("contains", m.Contains, (r4, e, t) => new qe(r4, t)).infixLeft("div", m.Divide, (r4, e, t) => new R("div", r4, t, (n, i2) => n / i2 | 0)).infixLeft("in", m.In, (r4, e, t) => new $e(r4, t)).infixLeft("is", m.Is, (r4, e, t) => new X(r4, t)).infixLeft("mod", m.Modulo, (r4, e, t) => new R("mod", r4, t, (n, i2) => n % i2)).infixLeft("or", m.Or, (r4, e, t) => new We(r4, t)).infixLeft("xor", m.Xor, (r4, e, t) => new ze(r4, t)).infixLeft("implies", m.Implies, (r4, e, t) => new Je(r4, t));
+function xe() {
+  return new Pe().registerPrefix("String", { parse: (r4, e) => new O({ type: c.string, value: e.value }) }).registerPrefix("DateTime", { parse: (r4, e) => new O({ type: c.dateTime, value: ae(e.value) }) }).registerPrefix("Quantity", { parse: (r4, e) => new O({ type: c.Quantity, value: Oi(e.value) }) }).registerPrefix("Number", { parse: (r4, e) => new O({ type: e.value.includes(".") ? c.decimal : c.integer, value: parseFloat(e.value) }) }).registerPrefix("true", { parse: () => new O({ type: c.boolean, value: true }) }).registerPrefix("false", { parse: () => new O({ type: c.boolean, value: false }) }).registerPrefix("Symbol", { parse: (r4, e) => new B(e.value) }).registerPrefix("{}", { parse: () => new Be() }).registerPrefix("(", wi).registerInfix("[", Ii).registerInfix("(", ki).prefix("+", m.UnaryAdd, (r4, e) => new qe("+", e, (t) => t)).prefix("-", m.UnarySubtract, (r4, e) => new C("-", e, e, (t, n) => -n)).infixLeft(".", m.Dot, (r4, e, t) => new G(r4, t)).infixLeft("/", m.Divide, (r4, e, t) => new C("/", r4, t, (n, i2) => n / i2)).infixLeft("*", m.Multiply, (r4, e, t) => new C("*", r4, t, (n, i2) => n * i2)).infixLeft("+", m.Add, (r4, e, t) => new C("+", r4, t, (n, i2) => n + i2)).infixLeft("-", m.Subtract, (r4, e, t) => new C("-", r4, t, (n, i2) => n - i2)).infixLeft("|", m.Union, (r4, e, t) => new ce(r4, t)).infixLeft("=", m.Equals, (r4, e, t) => new He(r4, t)).infixLeft("!=", m.NotEquals, (r4, e, t) => new Ge(r4, t)).infixLeft("~", m.Equivalent, (r4, e, t) => new Ke(r4, t)).infixLeft("!~", m.NotEquivalent, (r4, e, t) => new We(r4, t)).infixLeft("<", m.LessThan, (r4, e, t) => new C("<", r4, t, (n, i2) => n < i2)).infixLeft("<=", m.LessThanOrEquals, (r4, e, t) => new C("<=", r4, t, (n, i2) => n <= i2)).infixLeft(">", m.GreaterThan, (r4, e, t) => new C(">", r4, t, (n, i2) => n > i2)).infixLeft(">=", m.GreaterThanOrEquals, (r4, e, t) => new C(">=", r4, t, (n, i2) => n >= i2)).infixLeft("&", m.Ampersand, (r4, e, t) => new je(r4, t)).infixLeft("and", m.And, (r4, e, t) => new ze(r4, t)).infixLeft("as", m.As, (r4, e, t) => new X(r4, t)).infixLeft("contains", m.Contains, (r4, e, t) => new $e(r4, t)).infixLeft("div", m.Divide, (r4, e, t) => new C("div", r4, t, (n, i2) => n / i2 | 0)).infixLeft("in", m.In, (r4, e, t) => new Qe(r4, t)).infixLeft("is", m.Is, (r4, e, t) => new Z(r4, t)).infixLeft("mod", m.Modulo, (r4, e, t) => new C("mod", r4, t, (n, i2) => n % i2)).infixLeft("or", m.Or, (r4, e, t) => new Je(r4, t)).infixLeft("xor", m.Xor, (r4, e, t) => new Ye(r4, t)).infixLeft("implies", m.Implies, (r4, e, t) => new Xe(r4, t));
 }
-var wi = ge();
+var Vi = xe();
 var Br = ((f) => (f.BOOLEAN = "BOOLEAN", f.NUMBER = "NUMBER", f.QUANTITY = "QUANTITY", f.TEXT = "TEXT", f.REFERENCE = "REFERENCE", f.CANONICAL = "CANONICAL", f.DATE = "DATE", f.DATETIME = "DATETIME", f.PERIOD = "PERIOD", f.UUID = "UUID", f))(Br || {});
-var Fi = ((x) => (x.EQUALS = "eq", x.NOT_EQUALS = "ne", x.GREATER_THAN = "gt", x.LESS_THAN = "lt", x.GREATER_THAN_OR_EQUALS = "ge", x.LESS_THAN_OR_EQUALS = "le", x.STARTS_AFTER = "sa", x.ENDS_BEFORE = "eb", x.APPROXIMATELY = "ap", x.CONTAINS = "contains", x.EXACT = "exact", x.TEXT = "text", x.NOT = "not", x.ABOVE = "above", x.BELOW = "below", x.IN = "in", x.NOT_IN = "not-in", x.OF_TYPE = "of-type", x.MISSING = "missing", x.IDENTIFIER = "identifier", x.ITERATE = "iterate", x))(Fi || {});
-var ro = ((T) => (T.READ = "read", T.VREAD = "vread", T.UPDATE = "update", T.PATCH = "patch", T.DELETE = "delete", T.HISTORY = "history", T.HISTORY_INSTANCE = "history-instance", T.HISTORY_TYPE = "history-type", T.HISTORY_SYSTEM = "history-system", T.CREATE = "create", T.SEARCH = "search", T.SEARCH_TYPE = "search-type", T.SEARCH_SYSTEM = "search-system", T.SEARCH_COMPARTMENT = "search-compartment", T.CAPABILITIES = "capabilities", T.TRANSACTION = "transaction", T.BATCH = "batch", T.OPERATION = "operation", T))(ro || {});
+var Ui = ((x) => (x.EQUALS = "eq", x.NOT_EQUALS = "ne", x.GREATER_THAN = "gt", x.LESS_THAN = "lt", x.GREATER_THAN_OR_EQUALS = "ge", x.LESS_THAN_OR_EQUALS = "le", x.STARTS_AFTER = "sa", x.ENDS_BEFORE = "eb", x.APPROXIMATELY = "ap", x.CONTAINS = "contains", x.EXACT = "exact", x.TEXT = "text", x.NOT = "not", x.ABOVE = "above", x.BELOW = "below", x.IN = "in", x.NOT_IN = "not-in", x.OF_TYPE = "of-type", x.MISSING = "missing", x.IDENTIFIER = "identifier", x.ITERATE = "iterate", x))(Ui || {});
+var so = ((T) => (T.READ = "read", T.VREAD = "vread", T.UPDATE = "update", T.PATCH = "patch", T.DELETE = "delete", T.HISTORY = "history", T.HISTORY_INSTANCE = "history-instance", T.HISTORY_TYPE = "history-type", T.HISTORY_SYSTEM = "history-system", T.CREATE = "create", T.SEARCH = "search", T.SEARCH_TYPE = "search-type", T.SEARCH_SYSTEM = "search-system", T.SEARCH_COMPARTMENT = "search-compartment", T.CAPABILITIES = "capabilities", T.TRANSACTION = "transaction", T.BATCH = "batch", T.OPERATION = "operation", T))(so || {});
 function Xr(r4) {
   if (typeof window < "u")
     return window.atob(r4);
@@ -40026,20 +40025,20 @@ function Zr(r4) {
     return Buffer.from(r4, "binary").toString("base64");
   throw new Error("Unable to encode base64");
 }
-function Ut() {
+function qt() {
   let r4 = new Uint32Array(28);
-  return crypto.getRandomValues(r4), cr(r4.buffer);
+  return crypto.getRandomValues(r4), gr(r4.buffer);
 }
 async function en(r4) {
   return crypto.subtle.digest("SHA-256", new TextEncoder().encode(r4));
 }
-function ee() {
+function te() {
   return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, (r4) => {
     let e = Math.random() * 16 | 0;
     return (r4 === "x" ? e : e & 3 | 8).toString(16);
   });
 }
-var Xe = class {
+var et = class {
   constructor(e = 10) {
     this.max = e, this.cache = /* @__PURE__ */ new Map();
   }
@@ -40063,8 +40062,8 @@ var Xe = class {
     return this.cache.keys().next().value;
   }
 };
-var O = { CSS: "text/css", DICOM: "application/dicom", FAVICON: "image/vnd.microsoft.icon", FHIR_JSON: "application/fhir+json", FORM_URL_ENCODED: "application/x-www-form-urlencoded", HL7_V2: "x-application/hl7-v2+er7", HTML: "text/html", JAVASCRIPT: "text/javascript", JSON: "application/json", JSON_PATCH: "application/json-patch+json", PNG: "image/png", SVG: "image/svg+xml", TEXT: "text/plain", TYPESCRIPT: "text/typescript" };
-var Te = class {
+var V = { CSS: "text/css", DICOM: "application/dicom", FAVICON: "image/vnd.microsoft.icon", FHIR_JSON: "application/fhir+json", FORM_URL_ENCODED: "application/x-www-form-urlencoded", HL7_V2: "x-application/hl7-v2+er7", HTML: "text/html", JAVASCRIPT: "text/javascript", JSON: "application/json", JSON_PATCH: "application/json-patch+json", PNG: "image/png", SVG: "image/svg+xml", TEXT: "text/plain", TYPESCRIPT: "text/typescript" };
+var ve = class {
   constructor() {
     this.listeners = {};
   }
@@ -40089,9 +40088,9 @@ var Te = class {
     return !e.defaultPrevented;
   }
 };
-var Ze = class {
+var tt = class {
   constructor() {
-    this.emitter = new Te();
+    this.emitter = new ve();
   }
   dispatchEvent(e) {
     this.emitter.dispatchEvent(e);
@@ -40103,100 +40102,100 @@ var Ze = class {
     this.emitter.removeEventListener(e, t);
   }
 };
-var Bt = { "Patient-open": "Patient-open", "Patient-close": "Patient-close", "ImagingStudy-open": "ImagingStudy-open", "ImagingStudy-close": "ImagingStudy-close", "Encounter-open": "Encounter-open", "Encounter-close": "Encounter-close", "DiagnosticReport-open": "DiagnosticReport-open", "DiagnosticReport-close": "DiagnosticReport-close", "DiagnosticReport-select": "DiagnosticReport-select", "DiagnosticReport-update": "DiagnosticReport-update", syncerror: "syncerror" };
-var po = ["Patient", "Encounter", "ImagingStudy", "DiagnosticReport", "OperationOutcome", "Bundle"];
-var qt = ["DiagnosticReport-update"];
+var jt = { "Patient-open": "Patient-open", "Patient-close": "Patient-close", "ImagingStudy-open": "ImagingStudy-open", "ImagingStudy-close": "ImagingStudy-close", "Encounter-open": "Encounter-open", "Encounter-close": "Encounter-close", "DiagnosticReport-open": "DiagnosticReport-open", "DiagnosticReport-close": "DiagnosticReport-close", "DiagnosticReport-select": "DiagnosticReport-select", "DiagnosticReport-update": "DiagnosticReport-update", syncerror: "syncerror" };
+var go = ["Patient", "Encounter", "ImagingStudy", "DiagnosticReport", "OperationOutcome", "Bundle"];
+var $t = ["DiagnosticReport-update"];
 function nn(r4) {
-  return qt.includes(r4);
+  return $t.includes(r4);
 }
 function on(r4) {
-  if (qt.includes(r4))
-    throw new p(h(`'context.version' is required for '${r4}'.`));
+  if ($t.includes(r4))
+    throw new d(h(`'context.version' is required for '${r4}'.`));
 }
-var fo = { "Patient-open": { patient: { resourceType: "Patient" }, encounter: { resourceType: "Encounter", optional: true } }, "Patient-close": { patient: { resourceType: "Patient" }, encounter: { resourceType: "Encounter", optional: true } }, "ImagingStudy-open": { study: { resourceType: "ImagingStudy" }, encounter: { resourceType: "Encounter", optional: true }, patient: { resourceType: "Patient", optional: true } }, "ImagingStudy-close": { study: { resourceType: "ImagingStudy" }, encounter: { resourceType: "Encounter", optional: true }, patient: { resourceType: "Patient", optional: true } }, "Encounter-open": { encounter: { resourceType: "Encounter" }, patient: { resourceType: "Patient" } }, "Encounter-close": { encounter: { resourceType: "Encounter" }, patient: { resourceType: "Patient" } }, "DiagnosticReport-open": { report: { resourceType: "DiagnosticReport" }, encounter: { resourceType: "Encounter", optional: true }, study: { resourceType: "ImagingStudy", optional: true, manyAllowed: true }, patient: { resourceType: "Patient" } }, "DiagnosticReport-close": { report: { resourceType: "DiagnosticReport" }, encounter: { resourceType: "Encounter", optional: true }, study: { resourceType: "ImagingStudy", optional: true, manyAllowed: true }, patient: { resourceType: "Patient" } }, "DiagnosticReport-select": { report: { resourceType: "DiagnosticReport" }, select: { resourceType: "*", isArray: true } }, "DiagnosticReport-update": { report: { resourceType: "DiagnosticReport" }, patient: { resourceType: "Patient", optional: true }, study: { resourceType: "ImagingStudy", optional: true }, updates: { resourceType: "Bundle" } }, syncerror: { operationoutcome: { resourceType: "OperationOutcome" } } };
-function mo(r4) {
-  return po.includes(r4);
+var yo = { "Patient-open": { patient: { resourceType: "Patient" }, encounter: { resourceType: "Encounter", optional: true } }, "Patient-close": { patient: { resourceType: "Patient" }, encounter: { resourceType: "Encounter", optional: true } }, "ImagingStudy-open": { study: { resourceType: "ImagingStudy" }, encounter: { resourceType: "Encounter", optional: true }, patient: { resourceType: "Patient", optional: true } }, "ImagingStudy-close": { study: { resourceType: "ImagingStudy" }, encounter: { resourceType: "Encounter", optional: true }, patient: { resourceType: "Patient", optional: true } }, "Encounter-open": { encounter: { resourceType: "Encounter" }, patient: { resourceType: "Patient" } }, "Encounter-close": { encounter: { resourceType: "Encounter" }, patient: { resourceType: "Patient" } }, "DiagnosticReport-open": { report: { resourceType: "DiagnosticReport" }, encounter: { resourceType: "Encounter", optional: true }, study: { resourceType: "ImagingStudy", optional: true, manyAllowed: true }, patient: { resourceType: "Patient" } }, "DiagnosticReport-close": { report: { resourceType: "DiagnosticReport" }, encounter: { resourceType: "Encounter", optional: true }, study: { resourceType: "ImagingStudy", optional: true, manyAllowed: true }, patient: { resourceType: "Patient" } }, "DiagnosticReport-select": { report: { resourceType: "DiagnosticReport" }, select: { resourceType: "*", isArray: true } }, "DiagnosticReport-update": { report: { resourceType: "DiagnosticReport" }, patient: { resourceType: "Patient", optional: true }, study: { resourceType: "ImagingStudy", optional: true }, updates: { resourceType: "Bundle" } }, syncerror: { operationoutcome: { resourceType: "OperationOutcome" } } };
+function xo(r4) {
+  return go.includes(r4);
 }
 function sn(r4) {
   return !!r4.endpoint;
 }
-function $t(r4) {
-  if (!tt(r4))
-    throw new p(h("subscriptionRequest must be an object conforming to SubscriptionRequest type."));
+function Qt(r4) {
+  if (!nt(r4))
+    throw new d(h("subscriptionRequest must be an object conforming to SubscriptionRequest type."));
   let { channelType: e, mode: t, topic: n, events: i2 } = r4, o = { "hub.channel.type": e, "hub.mode": t, "hub.topic": n, "hub.events": i2.join(",") };
   return sn(r4) && (o.endpoint = r4.endpoint), new URLSearchParams(o).toString();
 }
-function tt(r4) {
+function nt(r4) {
   if (typeof r4 != "object")
     return false;
   let { channelType: e, mode: t, topic: n, events: i2 } = r4;
   if (!(e && t && n && i2) || typeof n != "string" || typeof i2 != "object" || !Array.isArray(i2) || i2.length < 1 || e !== "websocket" || t !== "subscribe" && t !== "unsubscribe")
     return false;
   for (let o of i2)
-    if (!Bt[o])
+    if (!jt[o])
       return false;
   return !(sn(r4) && !(typeof r4.endpoint == "string" && r4.endpoint.startsWith("ws")));
 }
 function rn(r4, e, t, n) {
   if (typeof e != "object")
-    throw new p(h(`context[${t}] is invalid. Context must contain a single valid FHIR resource! Resource is not an object.`));
+    throw new d(h(`context[${t}] is invalid. Context must contain a single valid FHIR resource! Resource is not an object.`));
   if (!(e.id && typeof e.id == "string"))
-    throw new p(h(`context[${t}] is invalid. Resource must contain a valid string ID.`));
+    throw new d(h(`context[${t}] is invalid. Resource must contain a valid string ID.`));
   if (!e.resourceType)
-    throw new p(h(`context[${t}] is invalid. Resource must contain a resource type. No resource type found.`));
+    throw new d(h(`context[${t}] is invalid. Resource must contain a resource type. No resource type found.`));
   let i2 = n.resourceType;
   if (i2 !== "*") {
-    if (!mo(e.resourceType))
-      throw new p(h(`context[${t}] is invalid. Resource must contain a valid FHIRcast resource type. Resource type is not a known resource type.`));
+    if (!xo(e.resourceType))
+      throw new d(h(`context[${t}] is invalid. Resource must contain a valid FHIRcast resource type. Resource type is not a known resource type.`));
     if (i2 && e.resourceType !== i2)
-      throw new p(h(`context[${t}] is invalid. context[${t}] for the '${r4}' event should contain resource of type ${i2}.`));
+      throw new d(h(`context[${t}] is invalid. context[${t}] for the '${r4}' event should contain resource of type ${i2}.`));
   }
 }
-function ho(r4, e, t, n, i2) {
+function To(r4, e, t, n, i2) {
   if (i2.set(e.key, (i2.get(e.key) ?? 0) + 1), !n.isArray)
     rn(r4, e.resource, t, n);
   else {
     let { resources: o } = e;
     if (!o)
-      throw new p(h(`context[${t}] is invalid. context[${t}] for the '${r4}' with key '${String(e.key)}' should contain an array of resources on the key 'resources'.`));
+      throw new d(h(`context[${t}] is invalid. context[${t}] for the '${r4}' with key '${String(e.key)}' should contain an array of resources on the key 'resources'.`));
     for (let s of o)
       rn(r4, s, t, n);
   }
 }
-function yo(r4, e) {
-  let t = /* @__PURE__ */ new Map(), n = fo[r4];
+function vo(r4, e) {
+  let t = /* @__PURE__ */ new Map(), n = yo[r4];
   for (let i2 = 0; i2 < e.length; i2++) {
     let o = e[i2].key;
     if (!n[o])
-      throw new p(h(`Key '${o}' not found for event '${r4}'. Make sure to add only valid keys.`));
-    ho(r4, e[i2], i2, n[o], t);
+      throw new d(h(`Key '${o}' not found for event '${r4}'. Make sure to add only valid keys.`));
+    To(r4, e[i2], i2, n[o], t);
   }
   for (let [i2, o] of Object.entries(n)) {
     if (!(o.optional || t.has(i2)))
-      throw new p(h(`Missing required key '${i2}' on context for '${r4}' event.`));
+      throw new d(h(`Missing required key '${i2}' on context for '${r4}' event.`));
     if (!o.manyAllowed && (t.get(i2) || 0) > 1)
-      throw new p(h(`${t.get(i2)} context entries with key '${i2}' found for the '${r4}' event when schema only allows for 1.`));
+      throw new d(h(`${t.get(i2)} context entries with key '${i2}' found for the '${r4}' event when schema only allows for 1.`));
   }
 }
-function jt(r4, e, t, n) {
+function Ht(r4, e, t, n) {
   if (!(r4 && typeof r4 == "string"))
-    throw new p(h("Must provide a topic."));
-  if (!Bt[e])
-    throw new p(h(`Must provide a valid FHIRcast event name. Supported events: ${Object.keys(Bt).join(", ")}`));
+    throw new d(h("Must provide a topic."));
+  if (!jt[e])
+    throw new d(h(`Must provide a valid FHIRcast event name. Supported events: ${Object.keys(jt).join(", ")}`));
   if (typeof t != "object")
-    throw new p(h("context must be a context object or array of context objects."));
-  if (qt.includes(e) && !n)
-    throw new p(h(`The '${e}' event must contain a 'context.versionId'.`));
+    throw new d(h("context must be a context object or array of context objects."));
+  if ($t.includes(e) && !n)
+    throw new d(h(`The '${e}' event must contain a 'context.versionId'.`));
   let i2 = Array.isArray(t) ? t : [t];
-  return yo(e, i2), { timestamp: (/* @__PURE__ */ new Date()).toISOString(), id: ee(), event: { "hub.topic": r4, "hub.event": e, context: i2, ...n ? { "context.versionId": n } : {} } };
+  return vo(e, i2), { timestamp: (/* @__PURE__ */ new Date()).toISOString(), id: te(), event: { "hub.topic": r4, "hub.event": e, context: i2, ...n ? { "context.versionId": n } : {} } };
 }
-var et = class extends Ze {
+var rt = class extends tt {
   constructor(t) {
     super();
     if (this.subRequest = t, !t.endpoint)
-      throw new p(h("Subscription request should contain an endpoint."));
-    if (!tt(t))
-      throw new p(h("Subscription request failed validation."));
+      throw new d(h("Subscription request should contain an endpoint."));
+    if (!nt(t))
+      throw new d(h("Subscription request failed validation."));
     let n = new WebSocket(t.endpoint);
     n.addEventListener("open", () => {
       this.dispatchEvent({ type: "connect" }), n.addEventListener("message", (i2) => {
@@ -40214,7 +40213,7 @@ var et = class extends Ze {
     this.websocket.close();
   }
 };
-function go(r4) {
+function So(r4) {
   let e = r4.replace(/-/g, "+").replace(/_/g, "/"), t = Xr(e), n = Array.from(t).reduce((o, s) => {
     let a = ("00" + s.charCodeAt(0).toString(16)).slice(-2);
     return `${o}%${a}`;
@@ -40224,21 +40223,29 @@ function go(r4) {
 function an(r4) {
   return r4.split(".").length === 3;
 }
-function Qt(r4) {
+function it(r4) {
   let [e, t, n] = r4.split(".");
-  return go(t);
+  return So(t);
 }
 function cn(r4) {
   try {
-    return typeof Qt(r4).login_id == "string";
+    return typeof it(r4).login_id == "string";
   } catch {
     return false;
   }
 }
-var xo;
-var C = class {
+function un(r4) {
+  try {
+    let t = it(r4).exp;
+    return typeof t == "number" ? t * 1e3 : void 0;
+  } catch {
+    return;
+  }
+}
+var Eo;
+var w = class {
   constructor(e) {
-    this[xo] = "ReadablePromise";
+    this[Eo] = "ReadablePromise";
     this.status = "pending";
     this.suspender = e.then((t) => (this.status = "success", this.response = t, t), (t) => {
       throw this.status = "error", this.error = t, t;
@@ -40270,10 +40277,10 @@ var C = class {
     return this.suspender.finally(e);
   }
 };
-xo = Symbol.toStringTag;
-var ve = class {
+Eo = Symbol.toStringTag;
+var Se = class {
   constructor(e) {
-    this.storage = e ?? (typeof localStorage < "u" ? localStorage : new Ht());
+    this.storage = e ?? (typeof localStorage < "u" ? localStorage : new Gt());
   }
   clear() {
     this.storage.clear();
@@ -40289,10 +40296,10 @@ var ve = class {
     return t ? JSON.parse(t) : void 0;
   }
   setObject(e, t) {
-    this.setString(e, t ? or(t) : void 0);
+    this.setString(e, t ? fr(t) : void 0);
   }
 };
-var Ht = class {
+var Gt = class {
   constructor() {
     this.data = /* @__PURE__ */ new Map();
   }
@@ -40315,23 +40322,23 @@ var Ht = class {
     return Array.from(this.data.keys())[e];
   }
 };
-var To = O.FHIR_JSON + ", */*; q=0.1";
-var vo = "https://api.medplum.com/";
-var So = 1e3;
-var Eo = 6e4;
-var ln = "Binary/";
-var dn = { resourceType: "Device", id: "system", deviceName: [{ name: "System" }] };
-var bo = ((o) => (o.ClientCredentials = "client_credentials", o.AuthorizationCode = "authorization_code", o.RefreshToken = "refresh_token", o.JwtBearer = "urn:ietf:params:oauth:grant-type:jwt-bearer", o.TokenExchange = "urn:ietf:params:oauth:grant-type:token-exchange", o))(bo || {});
-var Ro = ((o) => (o.AccessToken = "urn:ietf:params:oauth:token-type:access_token", o.RefreshToken = "urn:ietf:params:oauth:token-type:refresh_token", o.IdToken = "urn:ietf:params:oauth:token-type:id_token", o.Saml1Token = "urn:ietf:params:oauth:token-type:saml1", o.Saml2Token = "urn:ietf:params:oauth:token-type:saml2", o))(Ro || {});
-var Po = ((o) => (o.ClientSecretBasic = "client_secret_basic", o.ClientSecretPost = "client_secret_post", o.ClientSecretJwt = "client_secret_jwt", o.PrivateKeyJwt = "private_key_jwt", o.None = "none", o))(Po || {});
-var Ao = ((e) => (e.JwtBearer = "urn:ietf:params:oauth:client-assertion-type:jwt-bearer", e))(Ao || {});
-var pn = class extends Te {
+var bo = V.FHIR_JSON + ", */*; q=0.1";
+var Ro = "https://api.medplum.com/";
+var Po = 1e3;
+var Co = 6e4;
+var dn = "Binary/";
+var pn = { resourceType: "Device", id: "system", deviceName: [{ name: "System" }] };
+var Ao = ((o) => (o.ClientCredentials = "client_credentials", o.AuthorizationCode = "authorization_code", o.RefreshToken = "refresh_token", o.JwtBearer = "urn:ietf:params:oauth:grant-type:jwt-bearer", o.TokenExchange = "urn:ietf:params:oauth:grant-type:token-exchange", o))(Ao || {});
+var wo = ((o) => (o.AccessToken = "urn:ietf:params:oauth:token-type:access_token", o.RefreshToken = "urn:ietf:params:oauth:token-type:refresh_token", o.IdToken = "urn:ietf:params:oauth:token-type:id_token", o.Saml1Token = "urn:ietf:params:oauth:token-type:saml1", o.Saml2Token = "urn:ietf:params:oauth:token-type:saml2", o))(wo || {});
+var Io = ((o) => (o.ClientSecretBasic = "client_secret_basic", o.ClientSecretPost = "client_secret_post", o.ClientSecretJwt = "client_secret_jwt", o.PrivateKeyJwt = "private_key_jwt", o.None = "none", o))(Io || {});
+var ko = ((e) => (e.JwtBearer = "urn:ietf:params:oauth:client-assertion-type:jwt-bearer", e))(ko || {});
+var fn = class extends ve {
   constructor(t) {
     super();
     this.initComplete = true;
     if (t?.baseUrl && !t.baseUrl.startsWith("http"))
       throw new Error("Base URL must start with http or https");
-    if (this.options = t ?? {}, this.fetch = t?.fetch ?? Co(), this.storage = t?.storage ?? new ve(), this.createPdfImpl = t?.createPdf, this.baseUrl = mn(t?.baseUrl ?? vo), this.fhirBaseUrl = mn(rt(this.baseUrl, t?.fhirUrlPath ?? "fhir/R4/")), this.authorizeUrl = rt(this.baseUrl, t?.authorizeUrl ?? "oauth2/authorize"), this.tokenUrl = rt(this.baseUrl, t?.tokenUrl ?? "oauth2/token"), this.logoutUrl = rt(this.baseUrl, t?.logoutUrl ?? "oauth2/logout"), this.clientId = t?.clientId ?? "", this.clientSecret = t?.clientSecret ?? "", this.onUnauthenticated = t?.onUnauthenticated, this.cacheTime = t?.cacheTime ?? Eo, this.cacheTime > 0 ? this.requestCache = new Xe(t?.resourceCacheSize ?? So) : this.requestCache = void 0, t?.autoBatchTime ? (this.autoBatchTime = t.autoBatchTime, this.autoBatchQueue = []) : (this.autoBatchTime = 0, this.autoBatchQueue = void 0), t?.accessToken)
+    if (this.options = t ?? {}, this.fetch = t?.fetch ?? Oo(), this.storage = t?.storage ?? new Se(), this.createPdfImpl = t?.createPdf, this.baseUrl = hn(t?.baseUrl ?? Ro), this.fhirBaseUrl = hn(ot(this.baseUrl, t?.fhirUrlPath ?? "fhir/R4/")), this.authorizeUrl = ot(this.baseUrl, t?.authorizeUrl ?? "oauth2/authorize"), this.tokenUrl = ot(this.baseUrl, t?.tokenUrl ?? "oauth2/token"), this.logoutUrl = ot(this.baseUrl, t?.logoutUrl ?? "oauth2/logout"), this.clientId = t?.clientId ?? "", this.clientSecret = t?.clientSecret ?? "", this.onUnauthenticated = t?.onUnauthenticated, this.cacheTime = t?.cacheTime ?? Co, this.cacheTime > 0 ? this.requestCache = new et(t?.resourceCacheSize ?? Po) : this.requestCache = void 0, t?.autoBatchTime ? (this.autoBatchTime = t.autoBatchTime, this.autoBatchQueue = []) : (this.autoBatchTime = 0, this.autoBatchQueue = void 0), t?.accessToken)
       this.setAccessToken(t.accessToken), this.initPromise = Promise.resolve();
     else if (this.storage.getInitPromise !== void 0) {
       let n = this.storage.getInitPromise(), i2 = new Promise((o) => {
@@ -40370,7 +40377,7 @@ var pn = class extends Te {
     this.storage.clear(), sessionStorage.clear(), this.clearActiveLogin();
   }
   clearActiveLogin() {
-    this.storage.setString("activeLogin", void 0), this.requestCache?.clear(), this.accessToken = void 0, this.refreshToken = void 0, this.sessionDetails = void 0, this.medplumServer = void 0, this.dispatchEvent({ type: "change" });
+    this.storage.setString("activeLogin", void 0), this.requestCache?.clear(), this.accessToken = void 0, this.refreshToken = void 0, this.accessTokenExpires = void 0, this.sessionDetails = void 0, this.medplumServer = void 0, this.dispatchEvent({ type: "change" });
   }
   invalidateUrl(t) {
     t = t.toString(), this.requestCache?.delete(t);
@@ -40393,7 +40400,7 @@ var pn = class extends Te {
     t.startsWith(this.fhirBaseUrl) && this.autoBatchQueue ? o = new Promise((a, u2) => {
       this.autoBatchQueue.push({ method: "GET", url: t.replace(this.fhirBaseUrl, ""), options: n, resolve: a, reject: u2 }), this.autoBatchTimerId || (this.autoBatchTimerId = setTimeout(() => this.executeAutoBatch(), this.autoBatchTime));
     }) : o = this.request("GET", t, n);
-    let s = new C(o);
+    let s = new w(o);
     return this.setCacheEntry(t, s), s;
   }
   post(t, n, i2, o = {}) {
@@ -40403,7 +40410,7 @@ var pn = class extends Te {
     return t = t.toString(), this.setRequestBody(o, n), i2 && this.setRequestContentType(o, i2), this.invalidateUrl(t), this.request("PUT", t, o);
   }
   patch(t, n, i2 = {}) {
-    return t = t.toString(), this.setRequestBody(i2, n), this.setRequestContentType(i2, O.JSON_PATCH), this.invalidateUrl(t), this.request("PATCH", t, i2);
+    return t = t.toString(), this.setRequestBody(i2, n), this.setRequestContentType(i2, V.JSON_PATCH), this.invalidateUrl(t), this.request("PATCH", t, i2);
   }
   delete(t, n) {
     return t = t.toString(), this.invalidateUrl(t), this.request("DELETE", t, n);
@@ -40432,9 +40439,11 @@ var pn = class extends Te {
   }
   async signInWithRedirect(t) {
     let i2 = new URLSearchParams(window.location.search).get("code");
-    if (i2)
-      return this.processCode(i2);
-    await this.requestAuthorization(t);
+    if (!i2) {
+      await this.requestAuthorization(t);
+      return;
+    }
+    return this.processCode(i2);
   }
   signOutWithRedirect() {
     window.location.assign(this.logoutUrl);
@@ -40469,10 +40478,10 @@ var pn = class extends Te {
     return n && (i2.search = new URLSearchParams(n).toString()), i2;
   }
   search(t, n, i2) {
-    let o = this.fhirSearchUrl(t, n), s = o.toString() + "-search", a = this.getCacheEntry(s, i2);
+    let o = this.fhirSearchUrl(t, n), s = "search-" + o.toString(), a = this.getCacheEntry(s, i2);
     if (a)
       return a.value;
-    let u2 = new C((async () => {
+    let u2 = new w((async () => {
       let l2 = await this.get(o, i2);
       if (l2.entry)
         for (let f of l2.entry)
@@ -40484,17 +40493,17 @@ var pn = class extends Te {
   searchOne(t, n, i2) {
     let o = this.fhirSearchUrl(t, n);
     o.searchParams.set("_count", "1"), o.searchParams.sort();
-    let s = o.toString() + "-searchOne", a = this.getCacheEntry(s, i2);
+    let s = "searchOne-" + o.toString(), a = this.getCacheEntry(s, i2);
     if (a)
       return a.value;
-    let u2 = new C(this.search(t, o.searchParams, i2).then((l2) => l2.entry?.[0]?.resource));
+    let u2 = new w(this.search(t, o.searchParams, i2).then((l2) => l2.entry?.[0]?.resource));
     return this.setCacheEntry(s, u2), u2;
   }
   searchResources(t, n, i2) {
-    let s = this.fhirSearchUrl(t, n).toString() + "-searchResources", a = this.getCacheEntry(s, i2);
+    let s = "searchResources-" + this.fhirSearchUrl(t, n).toString(), a = this.getCacheEntry(s, i2);
     if (a)
       return a.value;
-    let u2 = new C(this.search(t, n, i2).then(yn));
+    let u2 = new w(this.search(t, n, i2).then(yn));
     return this.setCacheEntry(s, u2), u2;
   }
   async *searchResourcePages(t, n, i2) {
@@ -40507,8 +40516,11 @@ var pn = class extends Te {
     }
   }
   searchValueSet(t, n, i2) {
-    let o = this.fhirUrl("ValueSet", "$expand");
-    return o.searchParams.set("url", t), o.searchParams.set("filter", n), this.get(o.toString(), i2);
+    return this.valueSetExpand({ url: t, filter: n }, i2);
+  }
+  valueSetExpand(t, n) {
+    let i2 = this.fhirUrl("ValueSet", "$expand");
+    return i2.search = new URLSearchParams(t).toString(), this.get(i2.toString(), n);
   }
   getCached(t, n) {
     let i2 = this.requestCache?.get(this.fhirUrl(t, n).toString())?.value;
@@ -40519,7 +40531,7 @@ var pn = class extends Te {
     if (!n)
       return;
     if (n === "system")
-      return dn;
+      return pn;
     let [i2, o] = n.split("/");
     if (!(!i2 || !o))
       return this.getCached(i2, o);
@@ -40530,19 +40542,19 @@ var pn = class extends Te {
   readReference(t, n) {
     let i2 = t.reference;
     if (!i2)
-      return new C(Promise.reject(new Error("Missing reference")));
+      return new w(Promise.reject(new Error("Missing reference")));
     if (i2 === "system")
-      return new C(Promise.resolve(dn));
+      return new w(Promise.resolve(pn));
     let [o, s] = i2.split("/");
-    return !o || !s ? new C(Promise.reject(new Error("Invalid reference"))) : this.readResource(o, s, n);
+    return !o || !s ? new w(Promise.reject(new Error("Invalid reference"))) : this.readResource(o, s, n);
   }
   requestSchema(t) {
-    if (Dr(t))
+    if (Nr(t))
       return Promise.resolve();
     let n = t + "-requestSchema", i2 = this.getCacheEntry(n, void 0);
     if (i2)
       return i2.value;
-    let o = new C((async () => {
+    let o = new w((async () => {
       let s = `{
       StructureDefinitionList(name: "${t}") {
         resourceType,
@@ -40583,21 +40595,21 @@ var pn = class extends Te {
         target
       }
     }`.replace(/\s+/g, " "), a = await this.graphql(s);
-      It(a.data.StructureDefinitionList);
+      Ot(a.data.StructureDefinitionList);
       for (let u2 of a.data.SearchParameterList)
-        Ot(u2);
+        Dt(u2);
     })());
     return this.setCacheEntry(n, o), o;
   }
   requestProfileSchema(t) {
-    if (_r(t))
+    if (Mr(t))
       return Promise.resolve();
     let n = t + "-requestSchema", i2 = this.getCacheEntry(n, void 0);
     if (i2)
       return i2.value;
-    let o = new C((async () => {
+    let o = new w((async () => {
       let s = await this.searchOne("StructureDefinition", { url: t, _sort: "-_lastUpdated" });
-      s ? It([s], t) : console.warn(`No StructureDefinition found for ${t}!`);
+      s ? Ot([s], t) : console.warn(`No StructureDefinition found for ${t}!`);
     })());
     return this.setCacheEntry(n, o), o;
   }
@@ -40630,11 +40642,11 @@ var pn = class extends Te {
     return new Promise((a, u2) => {
       let l2 = new XMLHttpRequest(), f = () => l2.abort();
       s?.signal?.addEventListener("abort", f);
-      let P = (B) => {
-        s?.signal?.removeEventListener("abort", f), B instanceof Error ? u2(B) : a(B);
+      let E2 = (q) => {
+        s?.signal?.removeEventListener("abort", f), q instanceof Error ? u2(q) : a(q);
       };
-      l2.responseType = "json", l2.onabort = () => P(new Error("Request aborted")), l2.onerror = () => P(new Error("Request error")), o && (l2.upload.onprogress = (B) => o(B), l2.upload.onload = (B) => o(B)), l2.onload = () => {
-        l2.status >= 200 && l2.status < 300 ? P(l2.response) : P(new p(_e(l2.response || l2.statusText)));
+      l2.responseType = "json", l2.onabort = () => E2(new Error("Request aborted")), l2.onerror = () => E2(new Error("Request error")), o && (l2.upload.onprogress = (q) => o(q), l2.upload.onload = (q) => o(q)), l2.onload = () => {
+        l2.status >= 200 && l2.status < 300 ? E2(l2.response) : E2(new d(we(l2.response || l2.statusText)));
       }, l2.open("POST", t), l2.withCredentials = true, l2.setRequestHeader("Authorization", "Bearer " + this.accessToken), l2.setRequestHeader("Cache-Control", "no-cache, no-store, max-age=0"), l2.setRequestHeader("Content-Type", i2), l2.setRequestHeader("X-Medplum", "extended"), l2.send(n);
     });
   }
@@ -40646,7 +40658,7 @@ var pn = class extends Te {
   }
   createComment(t, n, i2) {
     let o = this.getProfile(), s, a;
-    return t.resourceType === "Encounter" && (s = z(t), a = t.subject), t.resourceType === "ServiceRequest" && (s = t.encounter, a = t.subject), t.resourceType === "Patient" && (a = z(t)), this.createResource({ resourceType: "Communication", basedOn: [z(t)], encounter: s, subject: a, sender: o ? z(o) : void 0, sent: (/* @__PURE__ */ new Date()).toISOString(), payload: [{ contentString: n }] }, i2);
+    return t.resourceType === "Encounter" && (s = J(t), a = t.subject), t.resourceType === "ServiceRequest" && (s = t.encounter, a = t.subject), t.resourceType === "Patient" && (a = J(t)), this.createResource({ resourceType: "Communication", basedOn: [J(t)], encounter: s, subject: a, sender: o ? J(o) : void 0, sent: (/* @__PURE__ */ new Date()).toISOString(), payload: [{ contentString: n }] }, i2);
   }
   async updateResource(t, n) {
     if (!t.resourceType)
@@ -40680,28 +40692,28 @@ var pn = class extends Te {
     return this.post(this.fhirBaseUrl.slice(0, -1), t, void 0, n);
   }
   sendEmail(t, n) {
-    return this.post("email/v1/send", t, O.JSON, n);
+    return this.post("email/v1/send", t, V.JSON, n);
   }
   graphql(t, n, i2, o) {
-    return this.post(this.fhirUrl("$graphql"), { query: t, operationName: n, variables: i2 }, O.JSON, o);
+    return this.post(this.fhirUrl("$graphql"), { query: t, operationName: n, variables: i2 }, V.JSON, o);
   }
   readResourceGraph(t, n, i2, o) {
     return this.get(`${this.fhirUrl(t, n)}/$graph?graph=${i2}`, o);
   }
   pushToAgent(t, n, i2, o, s, a) {
-    return this.post(this.fhirUrl("Agent", tr(t), "$push"), { destination: de(n), body: i2, contentType: o, waitForResponse: s }, O.FHIR_JSON, a);
+    return this.post(this.fhirUrl("Agent", ur(t), "$push"), { destination: pe(n), body: i2, contentType: o, waitForResponse: s }, V.FHIR_JSON, a);
   }
   getActiveLogin() {
     return this.storage.getObject("activeLogin");
   }
   async setActiveLogin(t) {
-    (!this.sessionDetails?.profile || de(this.sessionDetails.profile) !== t.profile?.reference) && this.clearActiveLogin(), this.setAccessToken(t.accessToken, t.refreshToken), this.storage.setObject("activeLogin", t), this.addLogin(t), this.refreshPromise = void 0, await this.refreshProfile();
+    (!this.sessionDetails?.profile || pe(this.sessionDetails.profile) !== t.profile?.reference) && this.clearActiveLogin(), this.setAccessToken(t.accessToken, t.refreshToken), this.storage.setObject("activeLogin", t), this.addLogin(t), this.refreshPromise = void 0, await this.refreshProfile();
   }
   getAccessToken() {
     return this.accessToken;
   }
   setAccessToken(t, n) {
-    this.accessToken = t, this.refreshToken = n, this.sessionDetails = void 0, this.medplumServer = cn(t);
+    this.accessToken = t, this.refreshToken = n, this.sessionDetails = void 0, this.accessTokenExpires = un(t), this.medplumServer = cn(t);
   }
   getLogins() {
     return this.storage.getObject("logins") ?? [];
@@ -40749,11 +40761,11 @@ var pn = class extends Te {
   async download(t, n = {}) {
     this.refreshPromise && await this.refreshPromise;
     let i2 = t.toString();
-    return i2.startsWith(ln) && (t = this.fhirUrl(i2)), this.addFetchOptionsDefaults(n), (await this.fetchWithRetry(t.toString(), n)).blob();
+    return i2.startsWith(dn) && (t = this.fhirUrl(i2)), this.addFetchOptionsDefaults(n), (await this.fetchWithRetry(t.toString(), n)).blob();
   }
   async uploadMedia(t, n, i2, o, s) {
     let a = await this.createBinary(t, i2, n);
-    return this.createResource({ resourceType: "Media", status: "completed", content: { contentType: n, url: ln + a.id, title: i2 }, ...o }, s);
+    return this.createResource({ resourceType: "Media", status: "completed", content: { contentType: n, url: dn + a.id, title: i2 }, ...o }, s);
   }
   async bulkExport(t = "", n, i2, o) {
     let s = t && `${t}/`, a = this.fhirUrl(`${s}$export`);
@@ -40765,7 +40777,7 @@ var pn = class extends Te {
     i2.Prefer = "respond-async";
     let o = await this.fetchWithRetry(t, n);
     if (o.status === 202) {
-      let s = await hn(o);
+      let s = await gn(o);
       if (s)
         return this.pollStatus(s);
     }
@@ -40782,13 +40794,13 @@ var pn = class extends Te {
     this.requestCache && this.requestCache.set(t, { requestTime: Date.now(), value: n });
   }
   cacheResource(t) {
-    t?.id && !t.meta?.tag?.some((n) => n.code === "SUBSETTED") && this.setCacheEntry(this.fhirUrl(t.resourceType, t.id).toString(), new C(Promise.resolve(t)));
+    t?.id && !t.meta?.tag?.some((n) => n.code === "SUBSETTED") && this.setCacheEntry(this.fhirUrl(t.resourceType, t.id).toString(), new w(Promise.resolve(t)));
   }
   deleteCacheEntry(t) {
     this.requestCache && this.requestCache.delete(t);
   }
   async request(t, n, i2 = {}) {
-    this.refreshPromise && await this.refreshPromise, i2.method = t, this.addFetchOptionsDefaults(i2);
+    await this.refreshIfExpired(), i2.method = t, this.addFetchOptionsDefaults(i2);
     let o = await this.fetchWithRetry(n, i2);
     return this.parseResponse(o, t, n, i2);
   }
@@ -40799,7 +40811,7 @@ var pn = class extends Te {
       return;
     let a = t.headers.get("content-type")?.includes("json");
     if (t.status === 404 && !a)
-      throw new p(Rr);
+      throw new d(ir);
     let u2 = t.headers.get("content-location"), l2 = o.redirect ?? this.options.redirect;
     if (t.status === 201 && u2 && l2 === "follow")
       return this.request("GET", u2, { ...o, body: void 0 });
@@ -40807,13 +40819,13 @@ var pn = class extends Te {
     if (a)
       try {
         f = await t.json();
-      } catch (P) {
-        throw console.error("Error parsing response", t.status, P), P;
+      } catch (E2) {
+        throw console.error("Error parsing response", t.status, E2), E2;
       }
     else
       f = await t.text();
     if (t.status >= 400)
-      throw new p(_e(f));
+      throw new d(we(f));
     return f;
   }
   async fetchWithRetry(t, n) {
@@ -40826,7 +40838,7 @@ var pn = class extends Te {
       } catch (u2) {
         this.retryCatch(a, i2, u2);
       }
-      await lt(o);
+      await xt(o);
     }
     return s;
   }
@@ -40847,10 +40859,10 @@ var pn = class extends Te {
       this.addFetchOptionsDefaults(s);
       let a = await this.fetchWithRetry(t, s);
       if (a.status !== 202 && (n = false, i2 = a, a.status === 201)) {
-        let u2 = await hn(a);
+        let u2 = await gn(a);
         u2 && (i2 = await this.fetchWithRetry(u2, s));
       }
-      await lt(o);
+      await xt(o);
     }
     return this.parseResponse(i2, "POST", t);
   }
@@ -40861,19 +40873,19 @@ var pn = class extends Te {
       try {
         o.resolve(await this.request(o.method, this.fhirBaseUrl + o.url, o.options));
       } catch (s) {
-        o.reject(new p(_e(s)));
+        o.reject(new d(we(s)));
       }
       return;
     }
     let n = { resourceType: "Bundle", type: "batch", entry: t.map((o) => ({ request: { method: o.method, url: o.url }, resource: o.options.body ? JSON.parse(o.options.body) : void 0 })) }, i2 = await this.post(this.fhirBaseUrl.slice(0, -1), n);
     for (let o = 0; o < t.length; o++) {
       let s = t[o], a = i2.entry?.[o];
-      a?.response?.outcome && !St(a.response.outcome) ? s.reject(new p(a.response.outcome)) : s.resolve(a?.resource);
+      a?.response?.outcome && !mt(a.response.outcome) ? s.reject(new d(a.response.outcome)) : s.resolve(a?.resource);
     }
   }
   addFetchOptionsDefaults(t) {
     let n = t.headers;
-    n || (n = {}, t.headers = n), n.Accept || (n.Accept = To), n["X-Medplum"] = "extended", t.body && !n["Content-Type"] && (n["Content-Type"] = O.FHIR_JSON), this.accessToken ? n.Authorization = "Bearer " + this.accessToken : this.basicAuth && (n.Authorization = "Basic " + this.basicAuth), t.cache || (t.cache = "no-cache"), t.credentials || (t.credentials = "include");
+    n || (n = {}, t.headers = n), n.Accept || (n.Accept = bo), n["X-Medplum"] = "extended", t.body && !n["Content-Type"] && (n["Content-Type"] = V.FHIR_JSON), this.accessToken ? n.Authorization = "Bearer " + this.accessToken : this.basicAuth && (n.Authorization = "Basic " + this.basicAuth), t.cache || (t.cache = "no-cache"), t.credentials || (t.credentials = "include");
   }
   setRequestContentType(t, n) {
     t.headers || (t.headers = {});
@@ -40887,25 +40899,28 @@ var pn = class extends Te {
     return this.refresh() ? this.request(t, n, i2) : (this.clearActiveLogin(), this.onUnauthenticated && this.onUnauthenticated(), Promise.reject(new Error("Unauthenticated")));
   }
   async startPkce() {
-    let t = Ut();
+    let t = qt();
     sessionStorage.setItem("pkceState", t);
-    let n = Ut();
+    let n = qt();
     sessionStorage.setItem("codeVerifier", n);
-    let i2 = await en(n), o = ur(i2).replaceAll("+", "-").replaceAll("/", "_").replaceAll("=", "");
+    let i2 = await en(n), o = yr(i2).replaceAll("+", "-").replaceAll("/", "_").replaceAll("=", "");
     return sessionStorage.setItem("codeChallenge", o), { codeChallengeMethod: "S256", codeChallenge: o };
   }
   async requestAuthorization(t) {
     let n = await this.ensureCodeChallenge(t ?? {}), i2 = new URL(this.authorizeUrl);
-    i2.searchParams.set("response_type", "code"), i2.searchParams.set("state", sessionStorage.getItem("pkceState")), i2.searchParams.set("client_id", n.clientId ?? this.clientId), i2.searchParams.set("redirect_uri", n.redirectUri ?? fn()), i2.searchParams.set("code_challenge_method", n.codeChallengeMethod), i2.searchParams.set("code_challenge", n.codeChallenge), i2.searchParams.set("scope", n.scope ?? "openid profile"), window.location.assign(i2.toString());
+    i2.searchParams.set("response_type", "code"), i2.searchParams.set("state", sessionStorage.getItem("pkceState")), i2.searchParams.set("client_id", n.clientId ?? this.clientId), i2.searchParams.set("redirect_uri", n.redirectUri ?? mn()), i2.searchParams.set("code_challenge_method", n.codeChallengeMethod), i2.searchParams.set("code_challenge", n.codeChallenge), i2.searchParams.set("scope", n.scope ?? "openid profile"), window.location.assign(i2.toString());
   }
   processCode(t, n) {
     let i2 = new URLSearchParams();
-    if (i2.set("grant_type", "authorization_code"), i2.set("code", t), i2.set("client_id", n?.clientId ?? this.clientId), i2.set("redirect_uri", n?.redirectUri ?? fn()), typeof sessionStorage < "u") {
+    if (i2.set("grant_type", "authorization_code"), i2.set("code", t), i2.set("client_id", n?.clientId ?? this.clientId), i2.set("redirect_uri", n?.redirectUri ?? mn()), typeof sessionStorage < "u") {
       let o = sessionStorage.getItem("codeVerifier");
       o && i2.set("code_verifier", o);
     }
     return this.fetchTokens(i2);
   }
+  refreshIfExpired() {
+    return !this.refreshPromise && this.accessTokenExpires !== void 0 && this.accessTokenExpires < Date.now() && this.refresh(), this.refreshPromise ?? Promise.resolve();
+  }
   refresh() {
     if (this.refreshPromise)
       return this.refreshPromise;
@@ -40935,26 +40950,26 @@ var pn = class extends Te {
   }
   async fhircastSubscribe(t, n) {
     if (!(typeof t == "string" && t !== ""))
-      throw new p(h("Invalid topic provided. Topic must be a valid string."));
+      throw new d(h("Invalid topic provided. Topic must be a valid string."));
     if (!(typeof n == "object" && Array.isArray(n) && n.length > 0))
-      throw new p(h("Invalid events provided. Events must be an array of event names containing at least one event."));
-    let i2 = { channelType: "websocket", mode: "subscribe", topic: t, events: n }, s = (await this.post("/fhircast/STU3", $t(i2), O.FORM_URL_ENCODED))["hub.channel.endpoint"];
+      throw new d(h("Invalid events provided. Events must be an array of event names containing at least one event."));
+    let i2 = { channelType: "websocket", mode: "subscribe", topic: t, events: n }, s = (await this.post("/fhircast/STU3", Qt(i2), V.FORM_URL_ENCODED))["hub.channel.endpoint"];
     if (!s)
       throw new Error("Invalid response!");
     return i2.endpoint = s, i2;
   }
   async fhircastUnsubscribe(t) {
-    if (!tt(t))
-      throw new p(h("Invalid topic or subscriptionRequest. SubscriptionRequest must be an object."));
+    if (!nt(t))
+      throw new d(h("Invalid topic or subscriptionRequest. SubscriptionRequest must be an object."));
     if (!(t.endpoint && typeof t.endpoint == "string" && t.endpoint.startsWith("ws")))
-      throw new p(h("Provided subscription request must have an endpoint in order to unsubscribe."));
-    t.mode = "unsubscribe", await this.post("/fhircast/STU3", $t(t), O.FORM_URL_ENCODED);
+      throw new d(h("Provided subscription request must have an endpoint in order to unsubscribe."));
+    t.mode = "unsubscribe", await this.post("/fhircast/STU3", Qt(t), V.FORM_URL_ENCODED);
   }
   fhircastConnect(t) {
-    return new et(t);
+    return new rt(t);
   }
   async fhircastPublish(t, n, i2, o) {
-    return nn(n) ? this.post(`/fhircast/STU3/${t}`, jt(t, n, i2, o), O.JSON) : (on(n), this.post(`/fhircast/STU3/${t}`, jt(t, n, i2), O.JSON));
+    return nn(n) ? this.post(`/fhircast/STU3/${t}`, Ht(t, n, i2, o), V.JSON) : (on(n), this.post(`/fhircast/STU3/${t}`, Ht(t, n, i2), V.JSON));
   }
   async fhircastGetContext(t) {
     return this.get(`/fhircast/STU3/${t}`);
@@ -40963,16 +40978,16 @@ var pn = class extends Te {
     return this.post("admin/projects/" + t + "/invite", n);
   }
   async fetchTokens(t) {
-    let n = { method: "POST", headers: { "Content-Type": O.FORM_URL_ENCODED }, body: t.toString(), credentials: "include" }, i2 = n.headers;
+    let n = { method: "POST", headers: { "Content-Type": V.FORM_URL_ENCODED }, body: t.toString(), credentials: "include" }, i2 = n.headers;
     this.basicAuth && (i2.Authorization = `Basic ${this.basicAuth}`);
     let o = await this.fetchWithRetry(this.tokenUrl, n);
     if (!o.ok) {
       this.clearActiveLogin();
       try {
         let a = await o.json();
-        throw new p(I(a.error_description));
+        throw new d(v(a.error_description));
       } catch (a) {
-        throw new p(I("Failed to fetch tokens"), a);
+        throw new d(v("Failed to fetch tokens"), a);
       }
     }
     let s = await o.json();
@@ -40981,7 +40996,7 @@ var pn = class extends Te {
   async verifyTokens(t) {
     let n = t.access_token;
     if (an(n)) {
-      let i2 = Qt(n);
+      let i2 = it(n);
       if (Date.now() >= i2.exp * 1e3)
         throw this.clearActiveLogin(), new Error("Token expired");
       if (i2.cid) {
@@ -41005,21 +41020,21 @@ var pn = class extends Te {
       throw i2;
   }
 };
-function Co() {
+function Oo() {
   if (!globalThis.fetch)
     throw new Error("Fetch not available in this environment");
   return globalThis.fetch.bind(globalThis);
 }
-function fn() {
+function mn() {
   return typeof window > "u" ? "" : window.location.protocol + "//" + window.location.host + "/";
 }
-function mn(r4) {
+function hn(r4) {
   return r4.endsWith("/") ? r4 : r4 + "/";
 }
-function rt(r4, e) {
+function ot(r4, e) {
   return new URL(e, r4).toString();
 }
-async function hn(r4) {
+async function gn(r4) {
   let e = r4.headers.get("content-location");
   if (e)
     return e;
@@ -41027,18 +41042,18 @@ async function hn(r4) {
   if (t)
     return t;
   let n = await r4.json();
-  if (Fe(n) && n.issue?.[0]?.diagnostics)
+  if (ne(n) && n.issue?.[0]?.diagnostics)
     return n.issue[0].diagnostics;
 }
 function yn(r4) {
   let e = r4.entry?.map((t) => t.resource) ?? [];
   return Object.assign(e, { bundle: r4 });
 }
-var wo = [...ye, "->", "<<", ">>"];
-var ko = ge().registerInfix("->", { precedence: m.Arrow }).registerInfix(";", { precedence: m.Semicolon });
-var Uo = [...ye, "eq", "ne", "co"];
-var $o = ge();
-var W = class {
+var Mo = [...ye, "->", "<<", ">>", "=="];
+var Uo = xe().registerInfix("->", { precedence: m.Arrow }).registerInfix(";", { precedence: m.Semicolon });
+var Zo = [...ye, "eq", "ne", "co"];
+var rs = xe();
+var z = class {
   constructor(e = "\r", t = "|", n = "^", i2 = "~", o = "\\", s = "&") {
     this.segmentSeparator = e;
     this.fieldSeparator = t;
@@ -41054,8 +41069,8 @@ var W = class {
     return this.componentSeparator + this.repetitionSeparator + this.escapeCharacter + this.subcomponentSeparator;
   }
 };
-var An = class r {
-  constructor(e, t = new W()) {
+var kn = class r {
+  constructor(e, t = new z()) {
     this.context = t, this.segments = e;
   }
   get header() {
@@ -41078,7 +41093,7 @@ var An = class r {
   }
   buildAck() {
     let e = /* @__PURE__ */ new Date(), t = this.getSegment("MSH"), n = t?.getField(3)?.toString() ?? "", i2 = t?.getField(4)?.toString() ?? "", o = t?.getField(5)?.toString() ?? "", s = t?.getField(6)?.toString() ?? "", a = t?.getField(10)?.toString() ?? "", u2 = t?.getField(12)?.toString() ?? "2.5.1";
-    return new r([new Se(["MSH", this.context.getMsh2(), o, s, n, i2, Qo(e), "", this.buildAckMessageType(t), e.getTime().toString(), "P", u2], this.context), new Se(["MSA", "AA", a, "OK"], this.context)]);
+    return new r([new be(["MSH", this.context.getMsh2(), o, s, n, i2, is(e), "", this.buildAckMessageType(t), e.getTime().toString(), "P", u2], this.context), new be(["MSA", "AA", a, "OK"], this.context)]);
   }
   buildAckMessageType(e) {
     let t = e?.getField(9), n = t?.getComponent(2), i2 = t?.getComponent(3), o = "ACK";
@@ -41089,13 +41104,13 @@ var An = class r {
       let n = new Error("Invalid HL7 message");
       throw n.type = "entity.parse.failed", n;
     }
-    let t = new W("\r", e.charAt(3), e.charAt(4), e.charAt(5), e.charAt(6), e.charAt(7));
-    return new r(e.split(/[\r\n]+/).map((n) => Se.parse(n, t)), t);
+    let t = new z("\r", e.charAt(3), e.charAt(4), e.charAt(5), e.charAt(6), e.charAt(7));
+    return new r(e.split(/[\r\n]+/).map((n) => be.parse(n, t)), t);
   }
 };
-var Se = class r2 {
-  constructor(e, t = new W()) {
-    this.context = t, sr(e) ? this.fields = e.map((n) => le.parse(n, t)) : this.fields = e, this.name = this.fields[0].components[0][0];
+var be = class r2 {
+  constructor(e, t = new z()) {
+    this.context = t, mr(e) ? this.fields = e.map((n) => de.parse(n, t)) : this.fields = e, this.name = this.fields[0].components[0][0];
   }
   get(e) {
     return this.fields[e];
@@ -41103,9 +41118,9 @@ var Se = class r2 {
   getField(e) {
     if (this.name === "MSH") {
       if (e === 1)
-        return new le([[this.context.getMsh1()]], this.context);
+        return new de([[this.context.getMsh1()]], this.context);
       if (e === 2)
-        return new le([[this.context.getMsh2()]], this.context);
+        return new de([[this.context.getMsh2()]], this.context);
       if (e > 2)
         return this.fields[e - 1];
     }
@@ -41117,12 +41132,12 @@ var Se = class r2 {
   toString() {
     return this.fields.map((e) => e.toString()).join(this.context.fieldSeparator);
   }
-  static parse(e, t = new W()) {
-    return new r2(e.split(t.fieldSeparator).map((n) => le.parse(n, t)), t);
+  static parse(e, t = new z()) {
+    return new r2(e.split(t.fieldSeparator).map((n) => de.parse(n, t)), t);
   }
 };
-var le = class r3 {
-  constructor(e, t = new W()) {
+var de = class r3 {
+  constructor(e, t = new z()) {
     this.context = t, this.components = e;
   }
   get(e, t, n = 0) {
@@ -41135,11 +41150,11 @@ var le = class r3 {
   toString() {
     return this.components.map((e) => e.join(this.context.componentSeparator)).join(this.context.repetitionSeparator);
   }
-  static parse(e, t = new W()) {
+  static parse(e, t = new z()) {
     return new r3(e.split(t.repetitionSeparator).map((n) => n.split(t.componentSeparator)), t);
   }
 };
-function Qo(r4) {
+function is(r4) {
   let e = r4 instanceof Date ? r4 : new Date(r4), n = e.toISOString().replace(/[-:T]/g, "").replace(/(\.\d+)?Z$/, ""), i2 = e.getUTCMilliseconds();
   return i2 > 0 && (n += "." + i2.toString()), n;
 }
@@ -41183,7 +41198,7 @@ var c2 = class extends i {
     e.on("data", (s) => {
       try {
         if (o += s.toString(), o.endsWith(p2 + v2)) {
-          let r4 = An.parse(o.substring(1, o.length - 2));
+          let r4 = kn.parse(o.substring(1, o.length - 2));
           this.dispatchEvent(new d2(this, r4)), o = "";
         }
       } catch (r4) {
@@ -41231,7 +41246,7 @@ var h2 = class extends i {
     this.connection && (this.connection.close(), delete this.connection);
   }
 };
-var E2 = class {
+var E = class {
   constructor(n) {
     this.handler = n;
   }
@@ -41323,11 +41338,11 @@ var DcmjsDimseScp = class extends dimse.Scp {
         accessToken: App.instance.medplum.getAccessToken(),
         channel: AgentDicomChannel.instance.definition.name,
         remote: "foo",
-        contentType: O.JSON,
+        contentType: V.JSON,
         body: JSON.stringify(request.getDataset())
       });
     } catch (err) {
-      App.instance.log.error(`DICOM error: ${li(err)}`);
+      App.instance.log.error(`DICOM error: ${Nn(err)}`);
     }
     const response = dimse.responses.CStoreResponse.fromRequest(request);
     response.setStatus(dimse.constants.Status.Success);
@@ -41342,7 +41357,7 @@ var AgentHl7Channel = class {
     this.definition = definition;
     this.endpoint = endpoint;
     this.connections = /* @__PURE__ */ new Map();
-    this.server = new E2((connection) => this.handleNewConnection(connection));
+    this.server = new E((connection) => this.handleNewConnection(connection));
   }
   start() {
     const address = new URL(this.endpoint.address);
@@ -41359,7 +41374,7 @@ var AgentHl7Channel = class {
   sendToRemote(msg) {
     const connection = this.connections.get(msg.remote);
     if (connection) {
-      connection.hl7Connection.send(An.parse(msg.body));
+      connection.hl7Connection.send(kn.parse(msg.body));
     }
   }
   handleNewConnection(connection) {
@@ -41381,14 +41396,14 @@ var AgentHl7ChannelConnection = class {
       this.channel.app.log.info(event.message.toString().replaceAll("\r", "\n"));
       this.channel.app.addToWebSocketQueue({
         type: "agent:transmit:request",
-        accessToken: this.channel.app.medplum.getAccessToken(),
+        accessToken: await this.channel.app.getAccessToken(),
         channel: this.channel.definition.name,
         remote: this.remote,
-        contentType: O.HL7_V2,
+        contentType: V.HL7_V2,
         body: event.message.toString()
       });
     } catch (err) {
-      this.channel.app.log.error(`HL7 error: ${li(err)}`);
+      this.channel.app.log.error(`HL7 error: ${Nn(err)}`);
     }
   }
   close() {
@@ -41405,26 +41420,41 @@ var App = class _App {
     this.channels = /* @__PURE__ */ new Map();
     this.hl7Queue = [];
     this.live = false;
+    this.shutdown = false;
     _App.instance = this;
     this.log = {
       info: console.log,
       warn: console.warn,
       error: console.error
     };
-    const webSocketUrl = new URL(medplum.getBaseUrl());
+    this.connectWebSocket();
+  }
+  connectWebSocket() {
+    const webSocketUrl = new URL(this.medplum.getBaseUrl());
     webSocketUrl.protocol = webSocketUrl.protocol === "https:" ? "wss:" : "ws:";
     webSocketUrl.pathname = "/ws/agent";
     this.log.info(`Connecting to WebSocket: ${webSocketUrl.href}`);
     this.webSocket = new wrapper_default(webSocketUrl);
     this.webSocket.binaryType = "nodebuffer";
-    this.webSocket.addEventListener("error", (err) => this.log.error(err.message));
+    this.webSocket.addEventListener("error", (err) => {
+      if (!this.shutdown) {
+        this.log.error(Nn(err.error));
+      }
+    });
     this.webSocket.addEventListener("open", () => {
       this.sendToWebSocket({
         type: "agent:connect:request",
-        accessToken: medplum.getAccessToken(),
-        agentId
+        accessToken: this.medplum.getAccessToken(),
+        agentId: this.agentId
       });
     });
+    this.webSocket.addEventListener("close", () => {
+      if (!this.shutdown) {
+        this.live = false;
+        this.log.info("WebSocket closed");
+        setTimeout(() => this.connectWebSocket(), 1e3);
+      }
+    });
     this.webSocket.addEventListener("message", (e) => {
       try {
         const data = e.data;
@@ -41448,11 +41478,14 @@ var App = class _App {
           case "agent:transmit:request":
             this.pushMessage(command);
             break;
+          case "agent:error":
+            this.log.error(command.body);
+            break;
           default:
             this.log.error(`Unknown message type: ${command.type}`);
         }
       } catch (err) {
-        this.log.error(`WebSocket error: ${li(err)}`);
+        this.log.error(`WebSocket error: ${Nn(err)}`);
       }
     });
   }
@@ -41480,9 +41513,18 @@ var App = class _App {
   }
   stop() {
     this.log.info("Medplum service stopping...");
+    this.shutdown = true;
     this.channels.forEach((channel) => channel.stop());
+    if (this.webSocket) {
+      this.webSocket.close();
+      this.webSocket = void 0;
+    }
     this.log.info("Medplum service stopped successfully");
   }
+  async getAccessToken() {
+    await this.medplum.refreshIfExpired();
+    return this.medplum.getAccessToken();
+  }
   addToWebSocketQueue(message) {
     this.webSocketQueue.push(message);
     this.trySendToWebSocket();
@@ -41513,6 +41555,9 @@ var App = class _App {
     }
   }
   sendToWebSocket(message) {
+    if (!this.webSocket) {
+      throw new Error("WebSocket not connected");
+    }
     this.webSocket.send(JSON.stringify(message));
   }
   pushMessage(message) {
@@ -41525,18 +41570,18 @@ var App = class _App {
       host: address.hostname,
       port: parseInt(address.port, 10)
     });
-    client.sendAndWait(An.parse(message.body)).then((response) => {
+    client.sendAndWait(kn.parse(message.body)).then((response) => {
       this.log.info(`Response: ${response.toString().replaceAll("\r", "\n")}`);
       this.addToWebSocketQueue({
         type: "agent:transmit:response",
         channel: message.channel,
         remote: message.remote,
         callback: message.callback,
-        contentType: O.HL7_V2,
+        contentType: V.HL7_V2,
         body: response.toString()
       });
     }).catch((err) => {
-      this.log.error(`HL7 error: ${li(err)}`);
+      this.log.error(`HL7 error: ${Nn(err)}`);
     }).finally(() => {
       client.close();
     });
@@ -41569,15 +41614,16 @@ async function main(argv) {
     process.exit(1);
   }
   const { baseUrl, clientId, clientSecret, agentId } = args;
-  const medplum = new pn({ baseUrl, clientId });
+  const medplum = new fn({ baseUrl, clientId });
   await medplum.startClientLogin(clientId, clientSecret);
   const app = new App(medplum, agentId);
   await app.start();
   process.on("SIGINT", () => {
-    console.log("\ngracefully shutting down from SIGINT (Crtl-C)");
+    console.log("Gracefully shutting down from SIGINT (Crtl-C)");
     app.stop();
     process.exit();
   });
+  return app;
 }
 function readCommandLineArgs(argv) {
   const [_node, _script, baseUrl, clientId, clientSecret, agentId] = argv;