@medplum/agent 3.2.27 → 3.2.29

package/dist/cjs/index.cjs

@@ -483,8 +483,8 @@ var require_utf32 = __commonJS({
       outer_loop:
         for (var i = 0; i < bufs.length; i++) {
           var buf = bufs[i];
-          for (var j = 0; j < buf.length; j++) {
-            b2.push(buf[j]);
+          for (var j2 = 0; j2 < buf.length; j2++) {
+            b2.push(buf[j2]);
             if (b2.length === 4) {
               if (charsProcessed === 0) {
                 if (b2[0] === 255 && b2[1] === 254 && b2[2] === 0 && b2[3] === 0) {
@@ -543,19 +543,19 @@ var require_utf16 = __commonJS({
     Utf16BEDecoder.prototype.write = function(buf) {
       if (buf.length == 0)
         return "";
-      var buf2 = Buffer2.alloc(buf.length + 1), i = 0, j = 0;
+      var buf2 = Buffer2.alloc(buf.length + 1), i = 0, j2 = 0;
       if (this.overflowByte !== -1) {
         buf2[0] = buf[0];
         buf2[1] = this.overflowByte;
         i = 1;
-        j = 2;
+        j2 = 2;
       }
-      for (; i < buf.length - 1; i += 2, j += 2) {
-        buf2[j] = buf[i + 1];
-        buf2[j + 1] = buf[i];
+      for (; i < buf.length - 1; i += 2, j2 += 2) {
+        buf2[j2] = buf[i + 1];
+        buf2[j2 + 1] = buf[i];
       }
       this.overflowByte = i == buf.length - 1 ? buf[buf.length - 1] : -1;
-      return buf2.slice(0, j).toString("ucs2");
+      return buf2.slice(0, j2).toString("ucs2");
     };
     Utf16BEDecoder.prototype.end = function() {
       this.overflowByte = -1;
@@ -623,8 +623,8 @@ var require_utf16 = __commonJS({
       outer_loop:
         for (var i = 0; i < bufs.length; i++) {
           var buf = bufs[i];
-          for (var j = 0; j < buf.length; j++) {
-            b2.push(buf[j]);
+          for (var j2 = 0; j2 < buf.length; j2++) {
+            b2.push(buf[j2]);
             if (b2.length === 2) {
               if (charsProcessed === 0) {
                 if (b2[0] === 255 && b2[1] === 254) return "utf-16le";
@@ -1548,13 +1548,13 @@ var require_dbcs_codec = __commonJS({
         var firstByteNode = this.decodeTables[0];
         for (var i2 = 129; i2 <= 254; i2++) {
           var secondByteNode = this.decodeTables[NODE_START - firstByteNode[i2]];
-          for (var j = 48; j <= 57; j++) {
-            if (secondByteNode[j] === UNASSIGNED) {
-              secondByteNode[j] = NODE_START - commonThirdByteNodeIdx;
-            } else if (secondByteNode[j] > NODE_START) {
+          for (var j2 = 48; j2 <= 57; j2++) {
+            if (secondByteNode[j2] === UNASSIGNED) {
+              secondByteNode[j2] = NODE_START - commonThirdByteNodeIdx;
+            } else if (secondByteNode[j2] > NODE_START) {
               throw new Error("gb18030 decode tables conflict at byte 2");
             }
-            var thirdByteNode = this.decodeTables[NODE_START - secondByteNode[j]];
+            var thirdByteNode = this.decodeTables[NODE_START - secondByteNode[j2]];
             for (var k2 = 129; k2 <= 254; k2++) {
               if (thirdByteNode[k2] === UNASSIGNED) {
                 thirdByteNode[k2] = NODE_START - commonFourthByteNodeIdx;
@@ -1564,9 +1564,9 @@ var require_dbcs_codec = __commonJS({
                 throw new Error("gb18030 decode tables conflict at byte 3");
               }
               var fourthByteNode = this.decodeTables[NODE_START - thirdByteNode[k2]];
-              for (var l3 = 48; l3 <= 57; l3++) {
-                if (fourthByteNode[l3] === UNASSIGNED)
-                  fourthByteNode[l3] = GB18030_CODE;
+              for (var l2 = 48; l2 <= 57; l2++) {
+                if (fourthByteNode[l2] === UNASSIGNED)
+                  fourthByteNode[l2] = GB18030_CODE;
               }
             }
           }
@@ -1582,8 +1582,8 @@ var require_dbcs_codec = __commonJS({
           if (typeof val === "number")
             skipEncodeChars[val] = true;
           else
-            for (var j = val.from; j <= val.to; j++)
-              skipEncodeChars[j] = true;
+            for (var j2 = val.from; j2 <= val.to; j2++)
+              skipEncodeChars[j2] = true;
         }
       this._fillEncodeTable(0, 0, skipEncodeChars);
       if (codecOptions.encodeAdd) {
@@ -1623,10 +1623,10 @@ var require_dbcs_codec = __commonJS({
       for (var k2 = 1; k2 < chunk.length; k2++) {
         var part = chunk[k2];
         if (typeof part === "string") {
-          for (var l3 = 0; l3 < part.length; ) {
-            var code = part.charCodeAt(l3++);
+          for (var l2 = 0; l2 < part.length; ) {
+            var code = part.charCodeAt(l2++);
             if (55296 <= code && code < 56320) {
-              var codeTrail = part.charCodeAt(l3++);
+              var codeTrail = part.charCodeAt(l2++);
               if (56320 <= codeTrail && codeTrail < 57344)
                 writeTable[curAddr++] = 65536 + (code - 55296) * 1024 + (codeTrail - 56320);
               else
@@ -1635,7 +1635,7 @@ var require_dbcs_codec = __commonJS({
               var len = 4095 - code + 2;
               var seq = [];
               for (var m2 = 0; m2 < len; m2++)
-                seq.push(part.charCodeAt(l3++));
+                seq.push(part.charCodeAt(l2++));
               writeTable[curAddr++] = SEQ_START - this.decodeTableSeq.length;
               this.decodeTableSeq.push(seq);
             } else
@@ -1643,7 +1643,7 @@ var require_dbcs_codec = __commonJS({
           }
         } else if (typeof part === "number") {
           var charCode = writeTable[curAddr - 1] + 1;
-          for (var l3 = 0; l3 < part; l3++)
+          for (var l2 = 0; l2 < part; l2++)
             writeTable[curAddr++] = charCode++;
         } else
           throw new Error("Incorrect type '" + typeof part + "' given in " + this.encodingName + " at chunk " + chunk[0]);
@@ -1678,7 +1678,7 @@ var require_dbcs_codec = __commonJS({
         bucket[low] = SEQ_START - this.encodeTableSeq.length;
         this.encodeTableSeq.push(node);
       }
-      for (var j = 1; j < seq.length - 1; j++) {
+      for (var j2 = 1; j2 < seq.length - 1; j2++) {
         var oldVal = node[uCode];
         if (typeof oldVal === "object")
           node = oldVal;
@@ -1728,7 +1728,7 @@ var require_dbcs_codec = __commonJS({
       this.gb18030 = codec.gb18030;
     }
     DBCSEncoder.prototype.write = function(str) {
-      var newBuf = Buffer2.alloc(str.length * (this.gb18030 ? 4 : 3)), leadSurrogate = this.leadSurrogate, seqObj = this.seqObj, nextChar = -1, i2 = 0, j = 0;
+      var newBuf = Buffer2.alloc(str.length * (this.gb18030 ? 4 : 3)), leadSurrogate = this.leadSurrogate, seqObj = this.seqObj, nextChar = -1, i2 = 0, j2 = 0;
       while (true) {
         if (nextChar === -1) {
           if (i2 == str.length) break;
@@ -1788,13 +1788,13 @@ var require_dbcs_codec = __commonJS({
             var idx = findIdx(this.gb18030.uChars, uCode);
             if (idx != -1) {
               var dbcsCode = this.gb18030.gbChars[idx] + (uCode - this.gb18030.uChars[idx]);
-              newBuf[j++] = 129 + Math.floor(dbcsCode / 12600);
+              newBuf[j2++] = 129 + Math.floor(dbcsCode / 12600);
               dbcsCode = dbcsCode % 12600;
-              newBuf[j++] = 48 + Math.floor(dbcsCode / 1260);
+              newBuf[j2++] = 48 + Math.floor(dbcsCode / 1260);
               dbcsCode = dbcsCode % 1260;
-              newBuf[j++] = 129 + Math.floor(dbcsCode / 10);
+              newBuf[j2++] = 129 + Math.floor(dbcsCode / 10);
               dbcsCode = dbcsCode % 10;
-              newBuf[j++] = 48 + dbcsCode;
+              newBuf[j2++] = 48 + dbcsCode;
               continue;
             }
           }
@@ -1802,47 +1802,47 @@ var require_dbcs_codec = __commonJS({
         if (dbcsCode === UNASSIGNED)
           dbcsCode = this.defaultCharSingleByte;
         if (dbcsCode < 256) {
-          newBuf[j++] = dbcsCode;
+          newBuf[j2++] = dbcsCode;
         } else if (dbcsCode < 65536) {
-          newBuf[j++] = dbcsCode >> 8;
-          newBuf[j++] = dbcsCode & 255;
+          newBuf[j2++] = dbcsCode >> 8;
+          newBuf[j2++] = dbcsCode & 255;
         } else if (dbcsCode < 16777216) {
-          newBuf[j++] = dbcsCode >> 16;
-          newBuf[j++] = dbcsCode >> 8 & 255;
-          newBuf[j++] = dbcsCode & 255;
+          newBuf[j2++] = dbcsCode >> 16;
+          newBuf[j2++] = dbcsCode >> 8 & 255;
+          newBuf[j2++] = dbcsCode & 255;
         } else {
-          newBuf[j++] = dbcsCode >>> 24;
-          newBuf[j++] = dbcsCode >>> 16 & 255;
-          newBuf[j++] = dbcsCode >>> 8 & 255;
-          newBuf[j++] = dbcsCode & 255;
+          newBuf[j2++] = dbcsCode >>> 24;
+          newBuf[j2++] = dbcsCode >>> 16 & 255;
+          newBuf[j2++] = dbcsCode >>> 8 & 255;
+          newBuf[j2++] = dbcsCode & 255;
         }
       }
       this.seqObj = seqObj;
       this.leadSurrogate = leadSurrogate;
-      return newBuf.slice(0, j);
+      return newBuf.slice(0, j2);
     };
     DBCSEncoder.prototype.end = function() {
       if (this.leadSurrogate === -1 && this.seqObj === void 0)
         return;
-      var newBuf = Buffer2.alloc(10), j = 0;
+      var newBuf = Buffer2.alloc(10), j2 = 0;
       if (this.seqObj) {
         var dbcsCode = this.seqObj[DEF_CHAR];
         if (dbcsCode !== void 0) {
           if (dbcsCode < 256) {
-            newBuf[j++] = dbcsCode;
+            newBuf[j2++] = dbcsCode;
           } else {
-            newBuf[j++] = dbcsCode >> 8;
-            newBuf[j++] = dbcsCode & 255;
+            newBuf[j2++] = dbcsCode >> 8;
+            newBuf[j2++] = dbcsCode & 255;
           }
         } else {
         }
         this.seqObj = void 0;
       }
       if (this.leadSurrogate !== -1) {
-        newBuf[j++] = this.defaultCharSingleByte;
+        newBuf[j2++] = this.defaultCharSingleByte;
         this.leadSurrogate = -1;
       }
-      return newBuf.slice(0, j);
+      return newBuf.slice(0, j2);
     };
     DBCSEncoder.prototype.findIdx = findIdx;
     function DBCSDecoder(options, codec) {
@@ -1855,7 +1855,7 @@ var require_dbcs_codec = __commonJS({
     }
     DBCSDecoder.prototype.write = function(buf) {
       var newBuf = Buffer2.alloc(buf.length * 2), nodeIdx = this.nodeIdx, prevBytes = this.prevBytes, prevOffset = this.prevBytes.length, seqStart = -this.prevBytes.length, uCode;
-      for (var i2 = 0, j = 0; i2 < buf.length; i2++) {
+      for (var i2 = 0, j2 = 0; i2 < buf.length; i2++) {
         var curByte = i2 >= 0 ? buf[i2] : prevBytes[i2 + prevOffset];
         var uCode = this.decodeTables[nodeIdx][curByte];
         if (uCode >= 0) {
@@ -1877,8 +1877,8 @@ var require_dbcs_codec = __commonJS({
           var seq = this.decodeTableSeq[SEQ_START - uCode];
           for (var k2 = 0; k2 < seq.length - 1; k2++) {
             uCode = seq[k2];
-            newBuf[j++] = uCode & 255;
-            newBuf[j++] = uCode >> 8;
+            newBuf[j2++] = uCode & 255;
+            newBuf[j2++] = uCode >> 8;
           }
           uCode = seq[seq.length - 1];
         } else
@@ -1886,18 +1886,18 @@ var require_dbcs_codec = __commonJS({
         if (uCode >= 65536) {
           uCode -= 65536;
           var uCodeLead = 55296 | uCode >> 10;
-          newBuf[j++] = uCodeLead & 255;
-          newBuf[j++] = uCodeLead >> 8;
+          newBuf[j2++] = uCodeLead & 255;
+          newBuf[j2++] = uCodeLead >> 8;
           uCode = 56320 | uCode & 1023;
         }
-        newBuf[j++] = uCode & 255;
-        newBuf[j++] = uCode >> 8;
+        newBuf[j2++] = uCode & 255;
+        newBuf[j2++] = uCode >> 8;
         nodeIdx = 0;
         seqStart = i2 + 1;
       }
       this.nodeIdx = nodeIdx;
       this.prevBytes = seqStart >= 0 ? Array.prototype.slice.call(buf, seqStart) : prevBytes.slice(seqStart + prevOffset).concat(Array.prototype.slice.call(buf));
-      return newBuf.slice(0, j).toString("ucs2");
+      return newBuf.slice(0, j2).toString("ucs2");
     };
     DBCSDecoder.prototype.end = function() {
       var ret = "";
@@ -1916,15 +1916,15 @@ var require_dbcs_codec = __commonJS({
     function findIdx(table, val) {
       if (table[0] > val)
         return -1;
-      var l3 = 0, r7 = table.length;
-      while (l3 < r7 - 1) {
-        var mid = l3 + (r7 - l3 + 1 >> 1);
+      var l2 = 0, r7 = table.length;
+      while (l2 < r7 - 1) {
+        var mid = l2 + (r7 - l2 + 1 >> 1);
         if (table[mid] <= val)
-          l3 = mid;
+          l2 = mid;
         else
           r7 = mid;
       }
-      return l3;
+      return l2;
     }
   }
 });
@@ -7633,12 +7633,12 @@ var require_dcmjs = __commonJS({
         };
         return _getPrototypeOf(o);
       }
-      function _setPrototypeOf(o, p2) {
-        _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf2(o2, p3) {
-          o2.__proto__ = p3;
+      function _setPrototypeOf(o, p3) {
+        _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf2(o2, p4) {
+          o2.__proto__ = p4;
           return o2;
         };
-        return _setPrototypeOf(o, p2);
+        return _setPrototypeOf(o, p3);
       }
       function _isNativeReflectConstruct() {
         if (typeof Reflect === "undefined" || !Reflect.construct) return false;
@@ -7767,7 +7767,7 @@ var require_dcmjs = __commonJS({
         var _arr = [];
         var _n2 = true;
         var _d = false;
-        var _s, _e2;
+        var _s, _e;
         try {
           for (_i = _i.call(arr); !(_n2 = (_s = _i.next()).done); _n2 = true) {
             _arr.push(_s.value);
@@ -7775,12 +7775,12 @@ var require_dcmjs = __commonJS({
           }
         } catch (err2) {
           _d = true;
-          _e2 = err2;
+          _e = err2;
         } finally {
           try {
             if (!_n2 && _i["return"] != null) _i["return"]();
           } finally {
-            if (_d) throw _e2;
+            if (_d) throw _e;
           }
         }
         return _arr;
@@ -7805,10 +7805,10 @@ 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) {
-            if (it) o = it;
+        var it2 = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"];
+        if (!it2) {
+          if (Array.isArray(o) || (it2 = _unsupportedIterableToArray(o)) || allowArrayLike) {
+            if (it2) o = it2;
             var i = 0;
             var F2 = function() {
             };
@@ -7834,10 +7834,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;
           },
@@ -7847,7 +7847,7 @@ 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;
             }
@@ -8156,17 +8156,17 @@ var require_dcmjs = __commonJS({
       };
       const pqdownheap = (s, tree, k2) => {
         const v2 = s.heap[k2];
-        let j = k2 << 1;
-        while (j <= s.heap_len) {
-          if (j < s.heap_len && smaller(tree, s.heap[j + 1], s.heap[j], s.depth)) {
-            j++;
+        let j2 = k2 << 1;
+        while (j2 <= s.heap_len) {
+          if (j2 < s.heap_len && smaller(tree, s.heap[j2 + 1], s.heap[j2], s.depth)) {
+            j2++;
           }
-          if (smaller(tree, v2, s.heap[j], s.depth)) {
+          if (smaller(tree, v2, s.heap[j2], s.depth)) {
             break;
           }
-          s.heap[k2] = s.heap[j];
-          k2 = j;
-          j <<= 1;
+          s.heap[k2] = s.heap[j2];
+          k2 = j2;
+          j2 <<= 1;
         }
         s.heap[k2] = v2;
       };
@@ -8752,7 +8752,7 @@ var require_dcmjs = __commonJS({
       };
       const fill_window = (s) => {
         const _w_size = s.w_size;
-        let p2, n, m2, more, str2;
+        let p3, n, m2, more, str2;
         do {
           more = s.window_size - s.lookahead - s.strstart;
           if (s.strstart >= _w_size + (_w_size - MIN_LOOKAHEAD)) {
@@ -8761,16 +8761,16 @@ var require_dcmjs = __commonJS({
             s.strstart -= _w_size;
             s.block_start -= _w_size;
             n = s.hash_size;
-            p2 = n;
+            p3 = n;
             do {
-              m2 = s.head[--p2];
-              s.head[p2] = m2 >= _w_size ? m2 - _w_size : 0;
+              m2 = s.head[--p3];
+              s.head[p3] = m2 >= _w_size ? m2 - _w_size : 0;
             } while (--n);
             n = _w_size;
-            p2 = n;
+            p3 = n;
             do {
-              m2 = s.prev[--p2];
-              s.prev[p2] = m2 >= _w_size ? m2 - _w_size : 0;
+              m2 = s.prev[--p3];
+              s.prev[p3] = m2 >= _w_size ? m2 - _w_size : 0;
             } while (--n);
             more += _w_size;
           }
@@ -9647,9 +9647,9 @@ var require_dcmjs = __commonJS({
           if (typeof source !== "object") {
             throw new TypeError(source + "must be non-object");
           }
-          for (const p2 in source) {
-            if (_has(source, p2)) {
-              obj[p2] = source[p2];
+          for (const p3 in source) {
+            if (_has(source, p3)) {
+              obj[p3] = source[p3];
             }
           }
         }
@@ -9657,11 +9657,11 @@ var require_dcmjs = __commonJS({
       };
       var flattenChunks = (chunks) => {
         let len2 = 0;
-        for (let i = 0, l3 = chunks.length; i < l3; i++) {
+        for (let i = 0, l2 = chunks.length; i < l2; i++) {
           len2 += chunks[i].length;
         }
         const result = new Uint8Array(len2);
-        for (let i = 0, pos = 0, l3 = chunks.length; i < l3; i++) {
+        for (let i = 0, pos = 0, l2 = chunks.length; i < l2; i++) {
           let chunk = chunks[i];
           result.set(chunk, pos);
           pos += chunk.length;
@@ -13156,8 +13156,8 @@ var require_dcmjs = __commonJS({
                 if (fragmentMultiframe) {
                   fragmentsLength = Math.ceil(frameStream.size / fragmentSize);
                 }
-                for (var j = 0, fragmentStart = 0; j < fragmentsLength; j++) {
-                  var isFinalFragment = j === fragmentsLength - 1;
+                for (var j2 = 0, fragmentStart = 0; j2 < fragmentsLength; j2++) {
+                  var isFinalFragment = j2 === fragmentsLength - 1;
                   var fragmentEnd = fragmentStart + frameStream.size;
                   if (fragmentMultiframe) {
                     fragmentEnd = fragmentStart + fragmentSize;
@@ -14823,21 +14823,21 @@ var require_dcmjs = __commonJS({
           key: "rgb2XYZ",
           value: function rgb2XYZ(rgb) {
             var R2 = Colors2.invGammaCorrection(rgb[0]);
-            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];
+            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];
           }
         }, {
           key: "xyz2LAB",
           value: function xyz2LAB(xyz) {
             var whitePoint = Colors2.d65WhitePointXYZ();
-            var X2 = xyz[0] / whitePoint[0];
+            var X = xyz[0] / whitePoint[0];
             var Y2 = xyz[1] / whitePoint[1];
-            var Z = xyz[2] / whitePoint[2];
-            X2 = Colors2.labf(X2);
+            var Z2 = xyz[2] / whitePoint[2];
+            X = Colors2.labf(X);
             Y2 = Colors2.labf(Y2);
-            Z = Colors2.labf(Z);
-            return [116 * Y2 - 16, 500 * (X2 - Y2), 200 * (Y2 - Z)];
+            Z2 = Colors2.labf(Z2);
+            return [116 * Y2 - 16, 500 * (X - Y2), 200 * (Y2 - Z2)];
           }
         }, {
           key: "lab2RGB",
@@ -15689,11 +15689,11 @@ var require_dcmjs = __commonJS({
             var byteOffset = existingFrames * sliceLength;
             var pixelDataUInt8View = new Uint8Array(dataset.PixelData, byteOffset, labelmaps.length * sliceLength);
             var occupiedValue = this._getOccupiedValue();
-            for (var l3 = 0; l3 < labelmaps.length; l3++) {
-              var labelmap = labelmaps[l3];
+            for (var l2 = 0; l2 < labelmaps.length; l2++) {
+              var labelmap = labelmaps[l2];
               for (var i = 0; i < labelmap.length; i++) {
                 if (labelmap[i] === segmentIndex) {
-                  pixelDataUInt8View[l3 * sliceLength + i] = occupiedValue;
+                  pixelDataUInt8View[l2 * sliceLength + i] = occupiedValue;
                 }
               }
             }
@@ -16311,8 +16311,8 @@ var require_dcmjs = __commonJS({
                 return contentItem.ConceptNameCodeSequence.CodeMeaning === TRACKING_IDENTIFIER;
               });
               var TrackingIdentifierValue = TrackingIdentifierGroup.TextValue;
-              var toolClass = hooks.getToolClass ? hooks.getToolClass(measurementGroup, dataset, registeredToolClasses) : registeredToolClasses.find(function(tc) {
-                return tc.isValidCornerstoneTrackingIdentifier(TrackingIdentifierValue);
+              var toolClass = hooks.getToolClass ? hooks.getToolClass(measurementGroup, dataset, registeredToolClasses) : registeredToolClasses.find(function(tc2) {
+                return tc2.isValidCornerstoneTrackingIdentifier(TrackingIdentifierValue);
               });
               if (toolClass) {
                 var measurement = toolClass.getMeasurementData(measurementGroup);
@@ -17727,8 +17727,8 @@ var require_dcmjs = __commonJS({
         var _matrix$shape = _slicedToArray(matrix.shape, 2), rows = _matrix$shape[0], cols = _matrix$shape[1];
         var result = ndarray$1(new Uint8Array(rows * cols), [rows, cols]);
         for (var i = 0; i < rows; i++) {
-          for (var j = 0; j < cols; j++) {
-            result.set(i, j, matrix.get(i, cols - 1 - j));
+          for (var j2 = 0; j2 < cols; j2++) {
+            result.set(i, j2, matrix.get(i, cols - 1 - j2));
           }
         }
         return result;
@@ -17736,9 +17736,9 @@ var require_dcmjs = __commonJS({
       function v(matrix) {
         var _matrix$shape2 = _slicedToArray(matrix.shape, 2), rows = _matrix$shape2[0], cols = _matrix$shape2[1];
         var result = ndarray$1(new Uint8Array(rows * cols), [rows, cols]);
-        for (var j = 0; j < cols; j++) {
+        for (var j2 = 0; j2 < cols; j2++) {
           for (var i = 0; i < rows; i++) {
-            result.set(i, j, matrix.get(rows - 1 - i, j));
+            result.set(i, j2, matrix.get(rows - 1 - i, j2));
           }
         }
         return result;
@@ -17748,8 +17748,8 @@ var require_dcmjs = __commonJS({
         var result = ndarray$1(new Uint8Array(rows * cols), [cols, rows]);
         var resultColsMinus1 = result.shape[1] - 1;
         for (var i = 0; i < rows; i++) {
-          for (var j = 0; j < cols; j++) {
-            result.set(j, resultColsMinus1 - i, matrix.get(i, j));
+          for (var j2 = 0; j2 < cols; j2++) {
+            result.set(j2, resultColsMinus1 - i, matrix.get(i, j2));
           }
         }
         return result;
@@ -17825,8 +17825,8 @@ var require_dcmjs = __commonJS({
           var imageId = images[frame].imageId;
           var imageIdSpecificToolState = toolState[imageId];
           var brushPixelData = imageIdSpecificToolState.brush.data[segmentIndex].pixelData;
-          for (var p2 = 0; p2 < brushPixelData.length; p2++) {
-            pixelData[pixelDataIndex] = brushPixelData[p2];
+          for (var p3 = 0; p3 < brushPixelData.length; p3++) {
+            pixelData[pixelDataIndex] = brushPixelData[p3];
             pixelDataIndex++;
           }
         }
@@ -17969,11 +17969,11 @@ var require_dcmjs = __commonJS({
         var _pixelData2D$shape = _slicedToArray(pixelData2D.shape, 2);
         _pixelData2D$shape[0];
         _pixelData2D$shape[1];
-        for (var p2 = 0; p2 < cToolsPixelData.length; p2++) {
-          if (pixelData2D.data[p2]) {
-            cToolsPixelData[p2] = 1;
+        for (var p3 = 0; p3 < cToolsPixelData.length; p3++) {
+          if (pixelData2D.data[p3]) {
+            cToolsPixelData[p3] = 1;
           } else {
-            cToolsPixelData[p2] = 0;
+            cToolsPixelData[p3] = 0;
           }
         }
       }
@@ -18303,39 +18303,39 @@ var require_dcmjs = __commonJS({
         return out;
       }
       function rotateX(out, a2, b2, rad) {
-        var p2 = [], r7 = [];
-        p2[0] = a2[0] - b2[0];
-        p2[1] = a2[1] - b2[1];
-        p2[2] = a2[2] - b2[2];
-        r7[0] = p2[0];
-        r7[1] = p2[1] * Math.cos(rad) - p2[2] * Math.sin(rad);
-        r7[2] = p2[1] * Math.sin(rad) + p2[2] * Math.cos(rad);
+        var p3 = [], r7 = [];
+        p3[0] = a2[0] - b2[0];
+        p3[1] = a2[1] - b2[1];
+        p3[2] = a2[2] - b2[2];
+        r7[0] = p3[0];
+        r7[1] = p3[1] * Math.cos(rad) - p3[2] * Math.sin(rad);
+        r7[2] = p3[1] * Math.sin(rad) + p3[2] * Math.cos(rad);
         out[0] = r7[0] + b2[0];
         out[1] = r7[1] + b2[1];
         out[2] = r7[2] + b2[2];
         return out;
       }
       function rotateY(out, a2, b2, rad) {
-        var p2 = [], r7 = [];
-        p2[0] = a2[0] - b2[0];
-        p2[1] = a2[1] - b2[1];
-        p2[2] = a2[2] - b2[2];
-        r7[0] = p2[2] * Math.sin(rad) + p2[0] * Math.cos(rad);
-        r7[1] = p2[1];
-        r7[2] = p2[2] * Math.cos(rad) - p2[0] * Math.sin(rad);
+        var p3 = [], r7 = [];
+        p3[0] = a2[0] - b2[0];
+        p3[1] = a2[1] - b2[1];
+        p3[2] = a2[2] - b2[2];
+        r7[0] = p3[2] * Math.sin(rad) + p3[0] * Math.cos(rad);
+        r7[1] = p3[1];
+        r7[2] = p3[2] * Math.cos(rad) - p3[0] * Math.sin(rad);
         out[0] = r7[0] + b2[0];
         out[1] = r7[1] + b2[1];
         out[2] = r7[2] + b2[2];
         return out;
       }
       function rotateZ(out, a2, b2, rad) {
-        var p2 = [], r7 = [];
-        p2[0] = a2[0] - b2[0];
-        p2[1] = a2[1] - b2[1];
-        p2[2] = a2[2] - b2[2];
-        r7[0] = p2[0] * Math.cos(rad) - p2[1] * Math.sin(rad);
-        r7[1] = p2[0] * Math.sin(rad) + p2[1] * Math.cos(rad);
-        r7[2] = p2[2];
+        var p3 = [], r7 = [];
+        p3[0] = a2[0] - b2[0];
+        p3[1] = a2[1] - b2[1];
+        p3[2] = a2[2] - b2[2];
+        r7[0] = p3[0] * Math.cos(rad) - p3[1] * Math.sin(rad);
+        r7[1] = p3[0] * Math.sin(rad) + p3[1] * Math.cos(rad);
+        r7[2] = p3[2];
         out[0] = r7[0] + b2[0];
         out[1] = r7[1] + b2[1];
         out[2] = r7[2] + b2[2];
@@ -18372,7 +18372,7 @@ var require_dcmjs = __commonJS({
       var forEach = function() {
         var vec = create();
         return function(a2, stride, offset, count, fn, arg) {
-          var i, l3;
+          var i, l2;
           if (!stride) {
             stride = 3;
           }
@@ -18380,11 +18380,11 @@ var require_dcmjs = __commonJS({
             offset = 0;
           }
           if (count) {
-            l3 = Math.min(count * stride + offset, a2.length);
+            l2 = Math.min(count * stride + offset, a2.length);
           } else {
-            l3 = a2.length;
+            l2 = a2.length;
           }
-          for (i = offset; i < l3; i += stride) {
+          for (i = offset; i < l2; i += stride) {
             vec[0] = a2[i];
             vec[1] = a2[i + 1];
             vec[2] = a2[i + 2];
@@ -18505,24 +18505,24 @@ var require_dcmjs = __commonJS({
         return headerUint32;
       }
       function getLiteralRunLength(uint8Row, i) {
-        for (var l3 = 0; l3 < uint8Row.length - i; l3++) {
-          if (uint8Row[i + l3] === uint8Row[i + l3 + 1] && uint8Row[i + l3 + 1] === uint8Row[i + l3 + 2]) {
-            return l3;
+        for (var l2 = 0; l2 < uint8Row.length - i; l2++) {
+          if (uint8Row[i + l2] === uint8Row[i + l2 + 1] && uint8Row[i + l2 + 1] === uint8Row[i + l2 + 2]) {
+            return l2;
           }
-          if (l3 === 128) {
-            return l3;
+          if (l2 === 128) {
+            return l2;
           }
         }
         return uint8Row.length - i;
       }
       function getReplicateRunLength(uint8Row, i) {
         var first = uint8Row[i];
-        for (var l3 = 1; l3 < uint8Row.length - i; l3++) {
-          if (uint8Row[i + l3] !== first) {
-            return l3;
+        for (var l2 = 1; l2 < uint8Row.length - i; l2++) {
+          if (uint8Row[i + l2] !== first) {
+            return l2;
           }
-          if (l3 === 128) {
-            return l3;
+          if (l2 === 128) {
+            return l2;
           }
         }
         return uint8Row.length - i;
@@ -18559,8 +18559,8 @@ var require_dcmjs = __commonJS({
           if (byteValue <= 127) {
             var N2 = byteValue + 1;
             var next = i + 1;
-            for (var p2 = next; p2 < next + N2; p2++) {
-              pixelData[pixelDataIndex] = uInt8Frame[p2];
+            for (var p3 = next; p3 < next + N2; p3++) {
+              pixelData[pixelDataIndex] = uInt8Frame[p3];
               pixelDataIndex++;
             }
             i += N2 + 1;
@@ -19459,10 +19459,10 @@ var require_dcmjs = __commonJS({
                 continue;
               }
               var data3 = alignedPixelDataI.data;
-              for (var j = 0, len2 = data3.length; j < len2; ++j) {
-                if (data3[j] !== 0) {
-                  temp2DArray[j]++;
-                  if (temp2DArray[j] > 1) {
+              for (var j2 = 0, len2 = data3.length; j2 < len2; ++j2) {
+                if (data3[j2] !== 0) {
+                  temp2DArray[j2]++;
+                  if (temp2DArray[j2] > 1) {
                     return true;
                   }
                 }
@@ -19526,9 +19526,9 @@ var require_dcmjs = __commonJS({
             var labelmap2DView = new Uint16Array(tempBuffer, byteOffset, sliceLength);
             var data3 = alignedPixelDataI.data;
             var segmentOnFrame = false;
-            for (var j = 0, len2 = alignedPixelDataI.data.length; j < len2; ++j) {
-              if (data3[j]) {
-                if (labelmap2DView[j] !== 0) {
+            for (var j2 = 0, len2 = alignedPixelDataI.data.length; j2 < len2; ++j2) {
+              if (data3[j2]) {
+                if (labelmap2DView[j2] !== 0) {
                   m2++;
                   if (m2 >= M3) {
                     labelmapBufferArray[m2] = new ArrayBuffer(arrayBufferLength);
@@ -19540,7 +19540,7 @@ var require_dcmjs = __commonJS({
                   _i2 = 0;
                   break;
                 } else {
-                  labelmap2DView[j] = segmentIndex;
+                  labelmap2DView[j2] = segmentIndex;
                   segmentOnFrame = true;
                 }
               }
@@ -19610,9 +19610,9 @@ var require_dcmjs = __commonJS({
           var byteOffset = sliceLength * 2 * imageIdIndex;
           var labelmap2DView = new Uint16Array(labelmapBufferArray[0], byteOffset, sliceLength);
           var data3 = alignedPixelDataI.data;
-          for (var j = 0, len2 = alignedPixelDataI.data.length; j < len2; ++j) {
-            if (data3[j]) {
-              for (var x2 = j; x2 < len2; ++x2) {
+          for (var j2 = 0, len2 = alignedPixelDataI.data.length; j2 < len2; ++j2) {
+            if (data3[j2]) {
+              for (var x2 = j2; x2 < len2; ++x2) {
                 if (data3[x2]) {
                   labelmap2DView[x2] = segmentIndex;
                 }
@@ -20344,8 +20344,8 @@ var require_dcmjs = __commonJS({
                 return contentItem.ConceptNameCodeSequence.CodeMeaning === TRACKING_IDENTIFIER;
               });
               var TrackingIdentifierValue = TrackingIdentifierGroup.TextValue;
-              var toolClass = hooks.getToolClass ? hooks.getToolClass(measurementGroup, dataset, registeredToolClasses) : registeredToolClasses.find(function(tc) {
-                return tc.isValidCornerstoneTrackingIdentifier(TrackingIdentifierValue);
+              var toolClass = hooks.getToolClass ? hooks.getToolClass(measurementGroup, dataset, registeredToolClasses) : registeredToolClasses.find(function(tc2) {
+                return tc2.isValidCornerstoneTrackingIdentifier(TrackingIdentifierValue);
               });
               if (toolClass) {
                 var measurement = toolClass.getMeasurementData(measurementGroup, sopInstanceUIDToImageIdMap, imageToWorldCoords, metadata);
@@ -21237,8 +21237,8 @@ var require_dcmjs = __commonJS({
               return item.GraphicData;
             }).filter(/* @__PURE__ */ function(s) {
               return function(a2) {
-                return function(j) {
-                  return !s.has(j) && s.add(j);
+                return function(j2) {
+                  return !s.has(j2) && s.add(j2);
                 }(JSON.stringify(a2));
               };
             }(/* @__PURE__ */ new Set()));
@@ -21356,8 +21356,8 @@ var require_dcmjs = __commonJS({
               return item.GraphicData;
             }).filter(/* @__PURE__ */ function(s) {
               return function(a2) {
-                return function(j) {
-                  return !s.has(j) && s.add(j);
+                return function(j2) {
+                  return !s.has(j2) && s.add(j2);
                 }(JSON.stringify(a2));
               };
             }(/* @__PURE__ */ new Set()));
@@ -21402,8 +21402,8 @@ var require_dcmjs = __commonJS({
             });
             return measurement.filter(/* @__PURE__ */ function(s) {
               return function(a2) {
-                return function(j) {
-                  return !s.has(j) && s.add(j);
+                return function(j2) {
+                  return !s.has(j2) && s.add(j2);
                 }(JSON.stringify(a2));
               };
             }(/* @__PURE__ */ new Set()));
@@ -21440,8 +21440,8 @@ var require_dcmjs = __commonJS({
               return item.GraphicData;
             }).filter(/* @__PURE__ */ function(s) {
               return function(a2) {
-                return function(j) {
-                  return !s.has(j) && s.add(j);
+                return function(j2) {
+                  return !s.has(j2) && s.add(j2);
                 }(JSON.stringify(a2));
               };
             }(/* @__PURE__ */ new Set()));
@@ -21485,8 +21485,8 @@ var require_dcmjs = __commonJS({
               return item.GraphicData;
             }).filter(/* @__PURE__ */ function(s) {
               return function(a2) {
-                return function(j) {
-                  return !s.has(j) && s.add(j);
+                return function(j2) {
+                  return !s.has(j2) && s.add(j2);
                 }(JSON.stringify(a2));
               };
             }(/* @__PURE__ */ new Set()));
@@ -21600,7 +21600,7 @@ var require_dcmjs = __commonJS({
       }
       function stringToUint8Array(str2) {
         var arr = new Uint8Array(str2.length);
-        for (var i = 0, j = str2.length; i < j; i++) {
+        for (var i = 0, j2 = str2.length; i < j2; i++) {
           arr[i] = str2.charCodeAt(i);
         }
         return arr;
@@ -27117,8 +27117,8 @@ var require_util = __commonJS({
     };
     exports2.nearestCommonProto = nearestCommonProto;
     var hardMixProtos = (ingredients, constructor, exclude = []) => {
-      var _a;
-      const base = (_a = (0, exports2.nearestCommonProto)(...ingredients)) !== null && _a !== void 0 ? _a : Object.prototype;
+      var _a2;
+      const base = (_a2 = (0, exports2.nearestCommonProto)(...ingredients)) !== null && _a2 !== void 0 ? _a2 : Object.prototype;
       const mixedProto = Object.create(base);
       const visitedProtos = (0, exports2.protoChain)(base);
       for (let prototype of ingredients) {
@@ -27248,8 +27248,8 @@ var require_mixin_tracking = __commonJS({
         frontier.forEach((item) => visited.add(item));
         const newFrontier = /* @__PURE__ */ new Set();
         frontier.forEach((item) => {
-          var _a;
-          const itemConstituents = (_a = mixins.get(item)) !== null && _a !== void 0 ? _a : (0, util_1.protoChain)(item.prototype).map((proto) => proto.constructor).filter((item2) => item2 !== null);
+          var _a2;
+          const itemConstituents = (_a2 = mixins.get(item)) !== null && _a2 !== void 0 ? _a2 : (0, util_1.protoChain)(item.prototype).map((proto) => proto.constructor).filter((item2) => item2 !== null);
           if (itemConstituents)
             itemConstituents.forEach((constituent) => {
               if (!visited.has(constituent) && !frontier.has(constituent))
@@ -27273,37 +27273,37 @@ var require_decorator = __commonJS({
     var util_1 = require_util();
     var mixin_tracking_1 = require_mixin_tracking();
     var mergeObjectsOfDecorators = (o1, o2) => {
-      var _a, _b;
+      var _a2, _b;
       const allKeys = (0, util_1.unique)([...Object.getOwnPropertyNames(o1), ...Object.getOwnPropertyNames(o2)]);
       const mergedObject = {};
       for (let key of allKeys)
-        mergedObject[key] = (0, util_1.unique)([...(_a = o1 === null || o1 === void 0 ? void 0 : o1[key]) !== null && _a !== void 0 ? _a : [], ...(_b = o2 === null || o2 === void 0 ? void 0 : o2[key]) !== null && _b !== void 0 ? _b : []]);
+        mergedObject[key] = (0, util_1.unique)([...(_a2 = o1 === null || o1 === void 0 ? void 0 : o1[key]) !== null && _a2 !== void 0 ? _a2 : [], ...(_b = o2 === null || o2 === void 0 ? void 0 : o2[key]) !== null && _b !== void 0 ? _b : []]);
       return mergedObject;
     };
     var mergePropertyAndMethodDecorators = (d1, d22) => {
-      var _a, _b, _c, _d;
+      var _a2, _b, _c, _d;
       return {
-        property: mergeObjectsOfDecorators((_a = d1 === null || d1 === void 0 ? void 0 : d1.property) !== null && _a !== void 0 ? _a : {}, (_b = d22 === null || d22 === void 0 ? void 0 : d22.property) !== null && _b !== void 0 ? _b : {}),
+        property: mergeObjectsOfDecorators((_a2 = d1 === null || d1 === void 0 ? void 0 : d1.property) !== null && _a2 !== void 0 ? _a2 : {}, (_b = d22 === null || d22 === void 0 ? void 0 : d22.property) !== null && _b !== void 0 ? _b : {}),
         method: mergeObjectsOfDecorators((_c = d1 === null || d1 === void 0 ? void 0 : d1.method) !== null && _c !== void 0 ? _c : {}, (_d = d22 === null || d22 === void 0 ? void 0 : d22.method) !== null && _d !== void 0 ? _d : {})
       };
     };
     var mergeDecorators = (d1, d22) => {
-      var _a, _b, _c, _d, _e2, _f;
+      var _a2, _b, _c, _d, _e, _f;
       return {
-        class: (0, util_1.unique)([...(_a = d1 === null || d1 === void 0 ? void 0 : d1.class) !== null && _a !== void 0 ? _a : [], ...(_b = d22 === null || d22 === void 0 ? void 0 : d22.class) !== null && _b !== void 0 ? _b : []]),
+        class: (0, util_1.unique)([...(_a2 = d1 === null || d1 === void 0 ? void 0 : d1.class) !== null && _a2 !== void 0 ? _a2 : [], ...(_b = d22 === null || d22 === void 0 ? void 0 : d22.class) !== null && _b !== void 0 ? _b : []]),
         static: mergePropertyAndMethodDecorators((_c = d1 === null || d1 === void 0 ? void 0 : d1.static) !== null && _c !== void 0 ? _c : {}, (_d = d22 === null || d22 === void 0 ? void 0 : d22.static) !== null && _d !== void 0 ? _d : {}),
-        instance: mergePropertyAndMethodDecorators((_e2 = d1 === null || d1 === void 0 ? void 0 : d1.instance) !== null && _e2 !== void 0 ? _e2 : {}, (_f = d22 === null || d22 === void 0 ? void 0 : d22.instance) !== null && _f !== void 0 ? _f : {})
+        instance: mergePropertyAndMethodDecorators((_e = d1 === null || d1 === void 0 ? void 0 : d1.instance) !== null && _e !== void 0 ? _e : {}, (_f = d22 === null || d22 === void 0 ? void 0 : d22.instance) !== null && _f !== void 0 ? _f : {})
       };
     };
     var decorators = /* @__PURE__ */ new Map();
     var findAllConstituentClasses = (...classes) => {
-      var _a;
+      var _a2;
       const allClasses = /* @__PURE__ */ new Set();
       const frontier = /* @__PURE__ */ new Set([...classes]);
       while (frontier.size > 0) {
         for (let clazz of frontier) {
           const protoChainClasses = (0, util_1.protoChain)(clazz.prototype).map((proto) => proto.constructor);
-          const mixinClasses = (_a = (0, mixin_tracking_1.getMixinsForClass)(clazz)) !== null && _a !== void 0 ? _a : [];
+          const mixinClasses = (_a2 = (0, mixin_tracking_1.getMixinsForClass)(clazz)) !== null && _a2 !== void 0 ? _a2 : [];
           const potentiallyNewClasses = [...protoChainClasses, ...mixinClasses];
           const newClasses = potentiallyNewClasses.filter((c) => !allClasses.has(c));
           for (let newClass of newClasses)
@@ -27352,12 +27352,12 @@ var require_decorator = __commonJS({
       return decorator(clazz);
     };
     var decorateMember = (decorator) => (object, key, ...otherArgs) => {
-      var _a, _b, _c;
+      var _a2, _b, _c;
       const decoratorTargetType = typeof object === "function" ? "static" : "instance";
       const decoratorType = typeof object[key] === "function" ? "method" : "property";
       const clazz = decoratorTargetType === "static" ? object : object.constructor;
       const decoratorsForClass = (0, exports2.getDecoratorsForClass)(clazz);
-      const decoratorsForTargetType = (_a = decoratorsForClass === null || decoratorsForClass === void 0 ? void 0 : decoratorsForClass[decoratorTargetType]) !== null && _a !== void 0 ? _a : {};
+      const decoratorsForTargetType = (_a2 = decoratorsForClass === null || decoratorsForClass === void 0 ? void 0 : decoratorsForClass[decoratorTargetType]) !== null && _a2 !== void 0 ? _a2 : {};
       decoratorsForClass[decoratorTargetType] = decoratorsForTargetType;
       let decoratorsForType = (_b = decoratorsForTargetType === null || decoratorsForTargetType === void 0 ? void 0 : decoratorsForTargetType[decoratorType]) !== null && _b !== void 0 ? _b : {};
       decoratorsForTargetType[decoratorType] = decoratorsForType;
@@ -27387,7 +27387,7 @@ var require_mixins = __commonJS({
     var decorator_1 = require_decorator();
     var mixin_tracking_1 = require_mixin_tracking();
     function Mixin(...constructors) {
-      var _a, _b, _c;
+      var _a2, _b, _c;
       const prototypes = constructors.map((constructor) => constructor.prototype);
       const initFunctionName = settings_1.settings.initFunction;
       if (initFunctionName !== null) {
@@ -27410,7 +27410,7 @@ var require_mixins = __commonJS({
       let DecoratedMixedClass = MixedClass;
       if (settings_1.settings.decoratorInheritance !== "none") {
         const classDecorators = settings_1.settings.decoratorInheritance === "deep" ? (0, decorator_1.deepDecoratorSearch)(...constructors) : (0, decorator_1.directDecoratorSearch)(...constructors);
-        for (let decorator of (_a = classDecorators === null || classDecorators === void 0 ? void 0 : classDecorators.class) !== null && _a !== void 0 ? _a : []) {
+        for (let decorator of (_a2 = classDecorators === null || classDecorators === void 0 ? void 0 : classDecorators.class) !== null && _a2 !== void 0 ? _a2 : []) {
           const result = decorator(DecoratedMixedClass);
           if (result) {
             DecoratedMixedClass = result;
@@ -27893,18 +27893,18 @@ var require_zalgo = __commonJS({
       function heComes(text2, options2) {
         var result = "";
         var counts;
-        var l3;
+        var l2;
         options2 = options2 || {};
         options2["up"] = typeof options2["up"] !== "undefined" ? options2["up"] : true;
         options2["mid"] = typeof options2["mid"] !== "undefined" ? options2["mid"] : true;
         options2["down"] = typeof options2["down"] !== "undefined" ? options2["down"] : true;
         options2["size"] = typeof options2["size"] !== "undefined" ? options2["size"] : "maxi";
         text2 = text2.split("");
-        for (l3 in text2) {
-          if (isChar(l3)) {
+        for (l2 in text2) {
+          if (isChar(l2)) {
             continue;
           }
-          result = result + text2[l3];
+          result = result + text2[l2];
           counts = { "up": 0, "down": 0, "mid": 0 };
           switch (options2.size) {
             case "mini":
@@ -29587,8 +29587,8 @@ var require_fecha_umd = __commonJS({
         for (var _i = 1; _i < arguments.length; _i++) {
           args[_i - 1] = arguments[_i];
         }
-        for (var _a = 0, args_1 = args; _a < args_1.length; _a++) {
-          var obj = args_1[_a];
+        for (var _a2 = 0, args_1 = args; _a2 < args_1.length; _a2++) {
+          var obj = args_1[_a2];
           for (var key in obj) {
             origObj[key] = obj[key];
           }
@@ -29909,7 +29909,7 @@ var require_fecha_umd = __commonJS({
         }
         var combinedI18nSettings = assign(assign({}, globalI18n), i18n);
         for (var i = 1; i < matches.length; i++) {
-          var _a = parseInfo[i - 1], field = _a[0], parser = _a[2];
+          var _a2 = parseInfo[i - 1], field = _a2[0], parser = _a2[2];
           var value = parser ? parser(matches[i], combinedI18nSettings) : +matches[i];
           if (value == null) {
             return null;
@@ -30595,9 +30595,9 @@ var require_buffer_list = __commonJS({
         key: "join",
         value: function join2(s) {
           if (this.length === 0) return "";
-          var p2 = this.head;
-          var ret = "" + p2.data;
-          while (p2 = p2.next) ret += s + p2.data;
+          var p3 = this.head;
+          var ret = "" + p3.data;
+          while (p3 = p3.next) ret += s + p3.data;
           return ret;
         }
       }, {
@@ -30605,12 +30605,12 @@ var require_buffer_list = __commonJS({
         value: function concat(n) {
           if (this.length === 0) return Buffer2.alloc(0);
           var ret = Buffer2.allocUnsafe(n >>> 0);
-          var p2 = this.head;
+          var p3 = this.head;
           var i = 0;
-          while (p2) {
-            copyBuffer(p2.data, ret, i);
-            i += p2.data.length;
-            p2 = p2.next;
+          while (p3) {
+            copyBuffer(p3.data, ret, i);
+            i += p3.data.length;
+            p3 = p3.next;
           }
           return ret;
         }
@@ -30638,12 +30638,12 @@ var require_buffer_list = __commonJS({
       }, {
         key: "_getString",
         value: function _getString(n) {
-          var p2 = this.head;
+          var p3 = this.head;
           var c = 1;
-          var ret = p2.data;
+          var ret = p3.data;
           n -= ret.length;
-          while (p2 = p2.next) {
-            var str = p2.data;
+          while (p3 = p3.next) {
+            var str = p3.data;
             var nb = n > str.length ? str.length : n;
             if (nb === str.length) ret += str;
             else ret += str.slice(0, n);
@@ -30651,11 +30651,11 @@ var require_buffer_list = __commonJS({
             if (n === 0) {
               if (nb === str.length) {
                 ++c;
-                if (p2.next) this.head = p2.next;
+                if (p3.next) this.head = p3.next;
                 else this.head = this.tail = null;
               } else {
-                this.head = p2;
-                p2.data = str.slice(nb);
+                this.head = p3;
+                p3.data = str.slice(nb);
               }
               break;
             }
@@ -30669,23 +30669,23 @@ var require_buffer_list = __commonJS({
         key: "_getBuffer",
         value: function _getBuffer(n) {
           var ret = Buffer2.allocUnsafe(n);
-          var p2 = this.head;
+          var p3 = this.head;
           var c = 1;
-          p2.data.copy(ret);
-          n -= p2.data.length;
-          while (p2 = p2.next) {
-            var buf = p2.data;
+          p3.data.copy(ret);
+          n -= p3.data.length;
+          while (p3 = p3.next) {
+            var buf = p3.data;
             var nb = n > buf.length ? buf.length : n;
             buf.copy(ret, ret.length - n, 0, nb);
             n -= nb;
             if (n === 0) {
               if (nb === buf.length) {
                 ++c;
-                if (p2.next) this.head = p2.next;
+                if (p3.next) this.head = p3.next;
                 else this.head = this.tail = null;
               } else {
-                this.head = p2;
-                p2.data = buf.slice(nb);
+                this.head = p3;
+                p3.data = buf.slice(nb);
               }
               break;
             }
@@ -30887,21 +30887,21 @@ var require_string_decoder = __commonJS({
       return byte >> 6 === 2 ? -1 : -2;
     }
     function utf8CheckIncomplete(self2, buf, i) {
-      var j = buf.length - 1;
-      if (j < i) return 0;
-      var nb = utf8CheckByte(buf[j]);
+      var j2 = buf.length - 1;
+      if (j2 < i) return 0;
+      var nb = utf8CheckByte(buf[j2]);
       if (nb >= 0) {
         if (nb > 0) self2.lastNeed = nb - 1;
         return nb;
       }
-      if (--j < i || nb === -2) return 0;
-      nb = utf8CheckByte(buf[j]);
+      if (--j2 < i || nb === -2) return 0;
+      nb = utf8CheckByte(buf[j2]);
       if (nb >= 0) {
         if (nb > 0) self2.lastNeed = nb - 2;
         return nb;
       }
-      if (--j < i || nb === -2) return 0;
-      nb = utf8CheckByte(buf[j]);
+      if (--j2 < i || nb === -2) return 0;
+      nb = utf8CheckByte(buf[j2]);
       if (nb >= 0) {
         if (nb > 0) {
           if (nb === 2) nb = 0;
@@ -30911,7 +30911,7 @@ var require_string_decoder = __commonJS({
       }
       return 0;
     }
-    function utf8CheckExtraBytes(self2, buf, p2) {
+    function utf8CheckExtraBytes(self2, buf, p3) {
       if ((buf[0] & 192) !== 128) {
         self2.lastNeed = 0;
         return "\uFFFD";
@@ -30930,14 +30930,14 @@ var require_string_decoder = __commonJS({
       }
     }
     function utf8FillLast(buf) {
-      var p2 = this.lastTotal - this.lastNeed;
-      var r7 = utf8CheckExtraBytes(this, buf, p2);
+      var p3 = this.lastTotal - this.lastNeed;
+      var r7 = utf8CheckExtraBytes(this, buf, p3);
       if (r7 !== void 0) return r7;
       if (this.lastNeed <= buf.length) {
-        buf.copy(this.lastChar, p2, 0, this.lastNeed);
+        buf.copy(this.lastChar, p3, 0, this.lastNeed);
         return this.lastChar.toString(this.encoding, 0, this.lastTotal);
       }
-      buf.copy(this.lastChar, p2, 0, buf.length);
+      buf.copy(this.lastChar, p3, 0, buf.length);
       this.lastNeed -= buf.length;
     }
     function utf8Text(buf, i) {
@@ -31607,11 +31607,11 @@ var require_stream_readable = __commonJS({
       var decoder = new StringDecoder(enc);
       this._readableState.decoder = decoder;
       this._readableState.encoding = this._readableState.decoder.encoding;
-      var p2 = this._readableState.buffer.head;
+      var p3 = this._readableState.buffer.head;
       var content = "";
-      while (p2 !== null) {
-        content += decoder.write(p2.data);
-        p2 = p2.next;
+      while (p3 !== null) {
+        content += decoder.write(p3.data);
+        p3 = p3.next;
       }
       this._readableState.buffer.clear();
       if (content !== "") this._readableState.buffer.push(content);
@@ -32126,7 +32126,7 @@ var require_stream_readable = __commonJS({
       };
     }
     function indexOf(xs, x2) {
-      for (var i = 0, l3 = xs.length; i < l3; i++) {
+      for (var i = 0, l2 = xs.length; i < l2; i++) {
         if (xs[i] === x2) return i;
       }
       return -1;
@@ -32536,8 +32536,8 @@ var require_stream_writable = __commonJS({
       state.bufferProcessing = true;
       var entry = state.bufferedRequest;
       if (stream._writev && entry && entry.next) {
-        var l3 = state.bufferedRequestCount;
-        var buffer = new Array(l3);
+        var l2 = state.bufferedRequestCount;
+        var buffer = new Array(l2);
         var holder = state.corkedRequestsFree;
         holder.entry = entry;
         var count = 0;
@@ -34185,9 +34185,9 @@ var require_color_string = __commonJS({
         var alpha = parseFloat(match[4]);
         var h2 = (parseFloat(match[1]) % 360 + 360) % 360;
         var s = clamp(parseFloat(match[2]), 0, 100);
-        var l3 = clamp(parseFloat(match[3]), 0, 100);
+        var l2 = clamp(parseFloat(match[3]), 0, 100);
         var a2 = clamp(isNaN(alpha) ? 1 : alpha, 0, 1);
-        return [h2, s, l3, a2];
+        return [h2, s, l2, a2];
       }
       return null;
     };
@@ -34464,7 +34464,7 @@ var require_conversions = __commonJS({
       var delta = max - min;
       var h2;
       var s;
-      var l3;
+      var l2;
       if (max === min) {
         h2 = 0;
       } else if (r7 === max) {
@@ -34478,15 +34478,15 @@ var require_conversions = __commonJS({
       if (h2 < 0) {
         h2 += 360;
       }
-      l3 = (min + max) / 2;
+      l2 = (min + max) / 2;
       if (max === min) {
         s = 0;
-      } else if (l3 <= 0.5) {
+      } else if (l2 <= 0.5) {
         s = delta / (max + min);
       } else {
         s = delta / (2 - max - min);
       }
-      return [h2, s * 100, l3 * 100];
+      return [h2, s * 100, l2 * 100];
     };
     convert.rgb.hsv = function(rgb) {
       var rdif;
@@ -34593,7 +34593,7 @@ var require_conversions = __commonJS({
       var x2 = xyz[0];
       var y2 = xyz[1];
       var z2 = xyz[2];
-      var l3;
+      var l2;
       var a2;
       var b2;
       x2 /= 95.047;
@@ -34602,30 +34602,30 @@ var require_conversions = __commonJS({
       x2 = x2 > 8856e-6 ? Math.pow(x2, 1 / 3) : 7.787 * x2 + 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;
-      l3 = 116 * y2 - 16;
+      l2 = 116 * y2 - 16;
       a2 = 500 * (x2 - y2);
       b2 = 200 * (y2 - z2);
-      return [l3, a2, b2];
+      return [l2, a2, b2];
     };
     convert.hsl.rgb = function(hsl) {
       var h2 = hsl[0] / 360;
       var s = hsl[1] / 100;
-      var l3 = hsl[2] / 100;
+      var l2 = hsl[2] / 100;
       var t1;
       var t2;
       var t3;
       var rgb;
       var val;
       if (s === 0) {
-        val = l3 * 255;
+        val = l2 * 255;
         return [val, val, val];
       }
-      if (l3 < 0.5) {
-        t2 = l3 * (1 + s);
+      if (l2 < 0.5) {
+        t2 = l2 * (1 + s);
       } else {
-        t2 = l3 + s - l3 * s;
+        t2 = l2 + s - l2 * s;
       }
-      t1 = 2 * l3 - t2;
+      t1 = 2 * l2 - t2;
       rgb = [0, 0, 0];
       for (var i = 0; i < 3; i++) {
         t3 = h2 + 1 / 3 * -(i - 1);
@@ -34651,16 +34651,16 @@ var require_conversions = __commonJS({
     convert.hsl.hsv = function(hsl) {
       var h2 = hsl[0];
       var s = hsl[1] / 100;
-      var l3 = hsl[2] / 100;
+      var l2 = hsl[2] / 100;
       var smin = s;
-      var lmin = Math.max(l3, 0.01);
+      var lmin = Math.max(l2, 0.01);
       var sv;
       var v;
-      l3 *= 2;
-      s *= l3 <= 1 ? l3 : 2 - l3;
+      l2 *= 2;
+      s *= l2 <= 1 ? l2 : 2 - l2;
       smin *= lmin <= 1 ? lmin : 2 - lmin;
-      v = (l3 + s) / 2;
-      sv = l3 === 0 ? 2 * smin / (lmin + smin) : 2 * s / (l3 + s);
+      v = (l2 + s) / 2;
+      sv = l2 === 0 ? 2 * smin / (lmin + smin) : 2 * s / (l2 + s);
       return [h2, sv * 100, v * 100];
     };
     convert.hsv.rgb = function(hsv) {
@@ -34669,23 +34669,23 @@ var require_conversions = __commonJS({
       var v = hsv[2] / 100;
       var hi2 = Math.floor(h2) % 6;
       var f2 = h2 - Math.floor(h2);
-      var p2 = 255 * v * (1 - s);
+      var p3 = 255 * v * (1 - s);
       var q2 = 255 * v * (1 - s * f2);
       var t = 255 * v * (1 - s * (1 - f2));
       v *= 255;
       switch (hi2) {
         case 0:
-          return [v, t, p2];
+          return [v, t, p3];
         case 1:
-          return [q2, v, p2];
+          return [q2, v, p3];
         case 2:
-          return [p2, v, t];
+          return [p3, v, t];
         case 3:
-          return [p2, q2, v];
+          return [p3, q2, v];
         case 4:
-          return [t, p2, v];
+          return [t, p3, v];
         case 5:
-          return [v, p2, q2];
+          return [v, p3, q2];
       }
     };
     convert.hsv.hsl = function(hsv) {
@@ -34695,14 +34695,14 @@ var require_conversions = __commonJS({
       var vmin = Math.max(v, 0.01);
       var lmin;
       var sl;
-      var l3;
-      l3 = (2 - s) * v;
+      var l2;
+      l2 = (2 - s) * v;
       lmin = (2 - s) * vmin;
       sl = s * vmin;
       sl /= lmin <= 1 ? lmin : 2 - lmin;
       sl = sl || 0;
-      l3 /= 2;
-      return [h2, sl * 100, l3 * 100];
+      l2 /= 2;
+      return [h2, sl * 100, l2 * 100];
     };
     convert.hwb.rgb = function(hwb) {
       var h2 = hwb[0] / 360;
@@ -34798,7 +34798,7 @@ var require_conversions = __commonJS({
       var x2 = xyz[0];
       var y2 = xyz[1];
       var z2 = xyz[2];
-      var l3;
+      var l2;
       var a2;
       var b2;
       x2 /= 95.047;
@@ -34807,19 +34807,19 @@ var require_conversions = __commonJS({
       x2 = x2 > 8856e-6 ? Math.pow(x2, 1 / 3) : 7.787 * x2 + 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;
-      l3 = 116 * y2 - 16;
+      l2 = 116 * y2 - 16;
       a2 = 500 * (x2 - y2);
       b2 = 200 * (y2 - z2);
-      return [l3, a2, b2];
+      return [l2, a2, b2];
     };
     convert.lab.xyz = function(lab) {
-      var l3 = lab[0];
+      var l2 = lab[0];
       var a2 = lab[1];
       var b2 = lab[2];
       var x2;
       var y2;
       var z2;
-      y2 = (l3 + 16) / 116;
+      y2 = (l2 + 16) / 116;
       x2 = a2 / 500 + y2;
       z2 = y2 - b2 / 200;
       var y22 = Math.pow(y2, 3);
@@ -34834,7 +34834,7 @@ var require_conversions = __commonJS({
       return [x2, y2, z2];
     };
     convert.lab.lch = function(lab) {
-      var l3 = lab[0];
+      var l2 = lab[0];
       var a2 = lab[1];
       var b2 = lab[2];
       var hr;
@@ -34846,10 +34846,10 @@ var require_conversions = __commonJS({
         h2 += 360;
       }
       c = Math.sqrt(a2 * a2 + b2 * b2);
-      return [l3, c, h2];
+      return [l2, c, h2];
     };
     convert.lch.lab = function(lch) {
-      var l3 = lch[0];
+      var l2 = lch[0];
       var c = lch[1];
       var h2 = lch[2];
       var a2;
@@ -34858,7 +34858,7 @@ var require_conversions = __commonJS({
       hr = h2 / 360 * 2 * Math.PI;
       a2 = c * Math.cos(hr);
       b2 = c * Math.sin(hr);
-      return [l3, a2, b2];
+      return [l2, a2, b2];
     };
     convert.rgb.ansi16 = function(args) {
       var r7 = args[0];
@@ -34972,16 +34972,16 @@ var require_conversions = __commonJS({
     };
     convert.hsl.hcg = function(hsl) {
       var s = hsl[1] / 100;
-      var l3 = hsl[2] / 100;
+      var l2 = hsl[2] / 100;
       var c = 1;
       var f2 = 0;
-      if (l3 < 0.5) {
-        c = 2 * s * l3;
+      if (l2 < 0.5) {
+        c = 2 * s * l2;
       } else {
-        c = 2 * s * (1 - l3);
+        c = 2 * s * (1 - l2);
       }
       if (c < 1) {
-        f2 = (l3 - 0.5 * c) / (1 - c);
+        f2 = (l2 - 0.5 * c) / (1 - c);
       }
       return [hsl[0], c * 100, f2 * 100];
     };
@@ -35058,14 +35058,14 @@ var require_conversions = __commonJS({
     convert.hcg.hsl = function(hcg) {
       var c = hcg[1] / 100;
       var g2 = hcg[2] / 100;
-      var l3 = g2 * (1 - c) + 0.5 * c;
+      var l2 = g2 * (1 - c) + 0.5 * c;
       var s = 0;
-      if (l3 > 0 && l3 < 0.5) {
-        s = c / (2 * l3);
-      } else if (l3 >= 0.5 && l3 < 1) {
-        s = c / (2 * (1 - l3));
+      if (l2 > 0 && l2 < 0.5) {
+        s = c / (2 * l2);
+      } else if (l2 >= 0.5 && l2 < 1) {
+        s = c / (2 * (1 - l2));
       }
-      return [hcg[0], s * 100, l3 * 100];
+      return [hcg[0], s * 100, l2 * 100];
     };
     convert.hcg.hwb = function(hcg) {
       var c = hcg[1] / 100;
@@ -35545,8 +35545,8 @@ var require_color = __commonJS({
         }
         var color1 = mixinColor.rgb();
         var color2 = this.rgb();
-        var p2 = weight === void 0 ? 0.5 : weight;
-        var w2 = 2 * p2 - 1;
+        var p3 = weight === void 0 ? 0.5 : weight;
+        var w2 = 2 * p3 - 1;
         var a2 = color1.alpha() - color2.alpha();
         var w1 = ((w2 * a2 === -1 ? w2 : (w2 + a2) / (1 + w2 * a2)) + 1) / 2;
         var w22 = 1 - w1;
@@ -35554,7 +35554,7 @@ var require_color = __commonJS({
           w1 * color1.red() + w22 * color2.red(),
           w1 * color1.green() + w22 * color2.green(),
           w1 * color1.blue() + w22 * color2.blue(),
-          color1.alpha() * p2 + color2.alpha() * (1 - p2)
+          color1.alpha() * p3 + color2.alpha() * (1 - p3)
         );
       }
     };
@@ -35657,7 +35657,7 @@ var require_colorspace = __commonJS({
       var split = namespace.split(delimiter || ":");
       var base = hex(split[0]);
       if (!split.length) return base;
-      for (var i = 0, l3 = split.length - 1; i < l3; i++) {
+      for (var i = 0, l2 = split.length - 1; i < l2; i++) {
         base = color(base).mix(color(hex(split[i + 1]))).saturate(1).hex();
       }
       return base;
@@ -35893,9 +35893,9 @@ var require_tail_file = __commonJS({
               stream.emit("data", data2);
             }
             data2 = (buff + data2).split(/\n+/);
-            const l3 = data2.length - 1;
+            const l2 = data2.length - 1;
             let i = 0;
-            for (; i < l3; i++) {
+            for (; i < l2; i++) {
               if (options.start == null || row > options.start) {
                 if (!iter) {
                   stream.emit("line", data2[i]);
@@ -35905,7 +35905,7 @@ var require_tail_file = __commonJS({
               }
               row++;
             }
-            buff = data2[l3];
+            buff = data2[l2];
             pos += bytes;
             return read();
           });
@@ -36120,15 +36120,15 @@ var require_file = __commonJS({
         });
         stream.on("data", (data2) => {
           data2 = (buff + data2).split(/\n+/);
-          const l3 = data2.length - 1;
+          const l2 = data2.length - 1;
           let i = 0;
-          for (; i < l3; i++) {
+          for (; i < l2; i++) {
             if (!options.start || row >= options.start) {
               add(data2[i]);
             }
             row++;
           }
-          buff = data2[l3];
+          buff = data2[l2];
         });
         stream.on("close", () => {
           if (buff) {
@@ -36629,16 +36629,16 @@ var require_http = __commonJS({
         stream.destroy = () => req.destroy();
         req.on("data", (data2) => {
           data2 = (buff + data2).split(/\n+/);
-          const l3 = data2.length - 1;
+          const l2 = data2.length - 1;
           let i = 0;
-          for (; i < l3; i++) {
+          for (; i < l2; i++) {
             try {
               stream.emit("log", JSON.parse(data2[i]));
             } catch (e) {
               stream.emit("error", e);
             }
           }
-          buff = data2[l3];
+          buff = data2[l2];
         });
         req.on("error", (err) => stream.emit("error", err));
         return stream;
@@ -36671,11 +36671,11 @@ var require_http = __commonJS({
       _doBatch(options, callback, auth, path) {
         this.batchOptions.push(options);
         if (this.batchOptions.length === 1) {
-          const me2 = this;
+          const me = this;
           this.batchCallback = callback;
           this.batchTimeoutID = setTimeout(function() {
-            me2.batchTimeoutID = -1;
-            me2._doBatchRequest(me2.batchCallback, auth, path);
+            me.batchTimeoutID = -1;
+            me._doBatchRequest(me.batchCallback, auth, path);
           }, this.batchInterval);
         }
         if (this.batchOptions.length === this.batchCount) {
@@ -38398,7 +38398,7 @@ var require_dcmjs_dimse_min = __commonJS({
     }(global, (e, t, s, n, i) => {
       return r7 = { 570: (e2, t2, s2) => {
         const { CGetRequest: n2, CStoreRequest: i2 } = s2(940), { CommandFieldType: r8, PresentationContextResult: o2, SopClass: a2, StorageClass: c, TransferSyntax: d3, Uid: u2, UserIdentityType: h2 } = s2(492), m2 = s2(139), { EOL: g2 } = s2(857);
-        class l3 {
+        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;
           }
@@ -38560,7 +38560,7 @@ var require_dcmjs_dimse_min = __commonJS({
             return this.presentationContexts.forEach((e4) => {
               const t4 = e4.id;
               t4 >= s3 && (s3 = t4 + 2);
-            }), this.presentationContexts.push({ id: s3, context: new l3(s3, e3) }), s3;
+            }), this.presentationContexts.push({ id: s3, context: new l2(s3, e3) }), s3;
           }
           addOrGetPresentationContext(e3) {
             const t3 = this.getPresentationContexts();
@@ -38674,7 +38674,7 @@ var require_dcmjs_dimse_min = __commonJS({
                 return `${e3}`;
             }
           }
-        }, PresentationContext: l3 };
+        }, PresentationContext: l2 };
       }, 422: (e2, t2, s2) => {
         const { Association: n2, PresentationContext: i2 } = s2(570), { TransferSyntax: r8, UserIdentityType: o2 } = s2(492), { Request: a2 } = s2(940), c = s2(371), d3 = s2(906), u2 = s2(547), h2 = s2(733), m2 = s2(278), g2 = s2(756);
         e2.exports = class extends h2 {
@@ -38705,26 +38705,26 @@ var require_dcmjs_dimse_min = __commonJS({
             });
             let h3 = {};
             a3.securityOptions && (h3 = { key: a3.securityOptions.key, cert: a3.securityOptions.cert, ca: a3.securityOptions.ca, requestCert: a3.securityOptions.requestCert, rejectUnauthorized: a3.securityOptions.rejectUnauthorized, minVersion: a3.securityOptions.minVersion, maxVersion: a3.securityOptions.maxVersion, ciphers: a3.securityOptions.ciphers }), u2.info(`Connecting to ${e3}:${t3} ${a3.securityOptions ? "(TLS)" : ""}`);
-            const l3 = (a3.securityOptions ? g2 : m2).connect({ host: e3, port: t3, ...h3 }), p2 = new c(l3, a3);
-            p2.on("connect", () => {
-              this.emit("connected"), p2.sendAssociationRequest(d4);
-            }), p2.on("associationAccepted", (e4) => {
-              this.emit("associationAccepted", e4), p2.sendRequests(this.requests);
-            }), p2.on("associationReleaseResponse", () => {
-              this.emit("associationReleased"), l3.end();
-            }), p2.on("associationRejected", (e4) => {
-              this.emit("associationRejected", e4), l3.end();
-            }), p2.on("done", () => {
-              setTimeout(() => p2.sendAssociationReleaseRequest(), this.associationLingerTimeout);
-            }), p2.on("cStoreRequest", (e4, t4) => {
+            const l2 = (a3.securityOptions ? g2 : m2).connect({ host: e3, port: t3, ...h3 }), p3 = new c(l2, a3);
+            p3.on("connect", () => {
+              this.emit("connected"), p3.sendAssociationRequest(d4);
+            }), p3.on("associationAccepted", (e4) => {
+              this.emit("associationAccepted", e4), p3.sendRequests(this.requests);
+            }), p3.on("associationReleaseResponse", () => {
+              this.emit("associationReleased"), l2.end();
+            }), p3.on("associationRejected", (e4) => {
+              this.emit("associationRejected", e4), l2.end();
+            }), p3.on("done", () => {
+              setTimeout(() => p3.sendAssociationReleaseRequest(), this.associationLingerTimeout);
+            }), p3.on("cStoreRequest", (e4, t4) => {
               this.emit("cStoreRequest", e4, t4);
-            }), p2.on("nEventReportRequest", (e4, t4) => {
+            }), p3.on("nEventReportRequest", (e4, t4) => {
               this.emit("nEventReportRequest", e4, t4);
-            }), p2.on("networkError", (e4) => {
-              l3.end(), this.emit("networkError", e4);
-            }), p2.on("close", () => {
-              this.statistics.addFromOtherStatistics(p2.getStatistics()), this.network = void 0, this.emit("closed");
-            }), this.network = p2;
+            }), p3.on("networkError", (e4) => {
+              l2.end(), this.emit("networkError", e4);
+            }), p3.on("close", () => {
+              this.statistics.addFromOtherStatistics(p3.getStatistics()), this.network = void 0, this.emit("closed");
+            }), this.network = p3;
           }
           getStatistics() {
             return this.statistics;
@@ -38819,7 +38819,7 @@ var require_dcmjs_dimse_min = __commonJS({
             }
           }
         }
-        class l3 extends c(g2, u2) {
+        class l2 extends c(g2, u2) {
           constructor(e3, t3, s3, i3) {
             switch (super(new a2({ CommandField: e3, CommandDataSetType: s3 ? 514 : 257 })), e3) {
               case n2.NGetRequest:
@@ -38882,7 +38882,7 @@ var require_dcmjs_dimse_min = __commonJS({
             return `${super.toString(e3)} [id: ${this.getMessageId() || ""}]`;
           }
         }
-        class p2 extends g2 {
+        class p3 extends g2 {
           constructor(e3, t3, s3, i3, r9) {
             switch (super(new a2({ CommandField: e3, CommandDataSetType: s3 ? 514 : 257, Status: i3, ErrorComment: r9 })), e3) {
               case n2.NGetRequest:
@@ -38989,12 +38989,12 @@ var require_dcmjs_dimse_min = __commonJS({
             }
           }
         }
-        class R2 extends l3 {
+        class R2 extends l2 {
           constructor() {
             super(n2.CEchoRequest, r8.Verification, false);
           }
         }
-        class S2 extends p2 {
+        class S2 extends p3 {
           constructor(e3, t3) {
             super(n2.CEchoResponse, r8.Verification, false, e3, t3);
           }
@@ -39004,7 +39004,7 @@ var require_dcmjs_dimse_min = __commonJS({
             return t3.setMessageIdBeingRespondedTo(e3.getMessageId()), t3;
           }
         }
-        class f2 extends l3 {
+        class f2 extends l2 {
           constructor(e3) {
             super(n2.CFindRequest, r8.StudyRootQueryRetrieveInformationModelFind, false), this.setPriority(e3 || i2.Medium);
           }
@@ -39039,7 +39039,7 @@ var require_dcmjs_dimse_min = __commonJS({
             return n3.setAffectedSopClassUid(r8.ModalityWorklistInformationModelFind), n3.setDataset(new a2(s3)), n3;
           }
         }
-        class y2 extends p2 {
+        class y2 extends p3 {
           constructor(e3, t3) {
             super(n2.CFindResponse, r8.StudyRootQueryRetrieveInformationModelFind, false, e3, t3);
           }
@@ -39049,7 +39049,7 @@ var require_dcmjs_dimse_min = __commonJS({
             return t3.setMessageIdBeingRespondedTo(e3.getMessageId()), t3;
           }
         }
-        class I2 extends l3 {
+        class I2 extends l2 {
           constructor(e3, t3) {
             if (super(n2.CStoreRequest, "", false), this.setPriority(t3 || i2.Medium), e3 instanceof a2) return this.setAffectedSopClassUid(e3.getElement("SOPClassUID")), this.setAffectedSopInstanceUid(e3.getElement("SOPInstanceUID")), void this.setDataset(e3);
             if ("string" == typeof e3 || e3 instanceof String) {
@@ -39067,7 +39067,7 @@ var require_dcmjs_dimse_min = __commonJS({
             void 0 !== this.needsFullDatasetLoading && true === this.needsFullDatasetLoading && void 0 !== this.datasetOrFile && "" !== this.datasetOrFile.trim() && this.setDataset(a2.fromFile(this.datasetOrFile));
           }
         }
-        class C2 extends p2 {
+        class C2 extends p3 {
           constructor(e3, t3) {
             super(n2.CStoreResponse, "", false, e3, t3);
           }
@@ -39077,7 +39077,7 @@ var require_dcmjs_dimse_min = __commonJS({
             return t3.setMessageIdBeingRespondedTo(e3.getMessageId()), t3.setAffectedSopClassUid(e3.getAffectedSopClassUid()), t3.setAffectedSopInstanceUid(e3.getAffectedSopInstanceUid()), t3;
           }
         }
-        class P2 extends l3 {
+        class P2 extends l2 {
           constructor(e3) {
             super(n2.CMoveRequest, r8.StudyRootQueryRetrieveInformationModelMove, false), this.setPriority(e3 || i2.Medium);
           }
@@ -39100,7 +39100,7 @@ var require_dcmjs_dimse_min = __commonJS({
             return o3.setDataset(new a2(r9)), o3.getCommandDataset().setElement("MoveDestination", e3), o3;
           }
         }
-        class A2 extends p2 {
+        class A2 extends p3 {
           constructor(e3, t3) {
             super(n2.CMoveResponse, r8.StudyRootQueryRetrieveInformationModelMove, false, e3, t3);
           }
@@ -39122,7 +39122,7 @@ var require_dcmjs_dimse_min = __commonJS({
             return t3.setMessageIdBeingRespondedTo(e3.getMessageId()), t3;
           }
         }
-        class v extends l3 {
+        class v extends l2 {
           constructor(e3) {
             super(n2.CGetRequest, r8.StudyRootQueryRetrieveInformationModelGet, false), this.setPriority(e3 || i2.Medium), this.addStorageSopClassesToAssociation = true;
           }
@@ -39151,7 +39151,7 @@ var require_dcmjs_dimse_min = __commonJS({
             return r9.setDataset(new a2(i3)), r9;
           }
         }
-        class w2 extends p2 {
+        class w2 extends p3 {
           constructor(e3, t3) {
             super(n2.CGetResponse, r8.StudyRootQueryRetrieveInformationModelGet, false, e3, t3);
           }
@@ -39173,12 +39173,12 @@ var require_dcmjs_dimse_min = __commonJS({
             return t3.setMessageIdBeingRespondedTo(e3.getMessageId()), t3;
           }
         }
-        class x2 extends l3 {
+        class x2 extends l2 {
           constructor(e3, t3, s3) {
             super(n2.NCreateRequest, e3, false), this.setAffectedSopInstanceUid(t3), this.setMetaSopClassUid(s3);
           }
         }
-        class U2 extends p2 {
+        class U2 extends p3 {
           constructor(e3, t3, s3, i3) {
             super(n2.NCreateResponse, e3, false, s3, i3), this.setAffectedSopInstanceUid(t3);
           }
@@ -39188,7 +39188,7 @@ var require_dcmjs_dimse_min = __commonJS({
             return t3.setMessageIdBeingRespondedTo(e3.getMessageId()), t3;
           }
         }
-        class q2 extends l3 {
+        class q2 extends l2 {
           constructor(e3, t3, s3, i3) {
             super(n2.NActionRequest, e3, false), this.setRequestedSopInstanceUid(t3), this.setActionTypeId(s3), this.setMetaSopClassUid(i3);
           }
@@ -39199,7 +39199,7 @@ var require_dcmjs_dimse_min = __commonJS({
             this.getCommandDataset().setElement("ActionTypeID", e3);
           }
         }
-        class D2 extends p2 {
+        class D2 extends p3 {
           constructor(e3, t3, s3, i3, r9) {
             super(n2.NActionResponse, e3, false, i3, r9), this.setAffectedSopInstanceUid(t3), this.setActionTypeId(s3);
           }
@@ -39215,12 +39215,12 @@ var require_dcmjs_dimse_min = __commonJS({
             return t3.setMessageIdBeingRespondedTo(e3.getMessageId()), t3;
           }
         }
-        class E2 extends l3 {
+        class E2 extends l2 {
           constructor(e3, t3, s3) {
             super(n2.NDeleteRequest, e3, false), this.setRequestedSopInstanceUid(t3), this.setMetaSopClassUid(s3);
           }
         }
-        class T extends p2 {
+        class T extends p3 {
           constructor(e3, t3, s3, i3) {
             super(n2.NDeleteResponse, e3, false, s3, i3), this.setAffectedSopInstanceUid(t3);
           }
@@ -39230,7 +39230,7 @@ var require_dcmjs_dimse_min = __commonJS({
             return t3.setMessageIdBeingRespondedTo(e3.getMessageId()), t3;
           }
         }
-        class b2 extends l3 {
+        class b2 extends l2 {
           constructor(e3, t3, s3, i3) {
             super(n2.NEventReportRequest, e3, false), this.setAffectedSopInstanceUid(t3), this.setEventTypeId(s3), this.setMetaSopClassUid(i3);
           }
@@ -39241,7 +39241,7 @@ var require_dcmjs_dimse_min = __commonJS({
             this.getCommandDataset().setElement("EventTypeID", e3);
           }
         }
-        class O2 extends p2 {
+        class O2 extends p3 {
           constructor(e3, t3, s3, i3, r9) {
             super(n2.NEventReportResponse, e3, false, i3, r9), this.setAffectedSopInstanceUid(t3), this.setEventTypeId(s3);
           }
@@ -39257,7 +39257,7 @@ var require_dcmjs_dimse_min = __commonJS({
             return t3.setMessageIdBeingRespondedTo(e3.getMessageId()), t3;
           }
         }
-        class N2 extends l3 {
+        class N2 extends l2 {
           constructor(e3, t3, s3, i3) {
             super(n2.NGetRequest, e3, false), this.setRequestedSopInstanceUid(t3), this.setAttributeIdentifierList(Array.isArray(s3) ? s3 : [s3]), this.setMetaSopClassUid(i3);
           }
@@ -39283,22 +39283,22 @@ var require_dcmjs_dimse_min = __commonJS({
             return "0".repeat(t3 - s3.length) + s3;
           }
         }
-        class B2 extends p2 {
+        class B extends p3 {
           constructor(e3, t3, s3, i3) {
             super(n2.NGetResponse, e3, false, s3, i3), this.setAffectedSopInstanceUid(t3);
           }
           static fromRequest(e3) {
             if (!(e3 instanceof N2)) throw new Error("Request should be an instance of NGetRequest");
-            const t3 = new B2(e3.getRequestedSopClassUid(), e3.getRequestedSopInstanceUid(), o2.ProcessingFailure);
+            const t3 = new B(e3.getRequestedSopClassUid(), e3.getRequestedSopInstanceUid(), o2.ProcessingFailure);
             return t3.setMessageIdBeingRespondedTo(e3.getMessageId()), t3;
           }
         }
-        class M3 extends l3 {
+        class M3 extends l2 {
           constructor(e3, t3, s3) {
             super(n2.NSetRequest, e3, false), this.setRequestedSopInstanceUid(t3), this.setMetaSopClassUid(s3);
           }
         }
-        class L2 extends p2 {
+        class L2 extends p3 {
           constructor(e3, t3, s3, i3) {
             super(n2.NSetResponse, e3, false, s3, i3), this.setAffectedSopInstanceUid(t3);
           }
@@ -39308,7 +39308,7 @@ var require_dcmjs_dimse_min = __commonJS({
             return t3.setMessageIdBeingRespondedTo(e3.getMessageId()), t3;
           }
         }
-        class F2 extends l3 {
+        class F2 extends l2 {
           constructor(e3, t3) {
             super(n2.CCancelRequest, e3, false), this.setMessageIdBeingRespondedTo(t3);
           }
@@ -39323,7 +39323,7 @@ var require_dcmjs_dimse_min = __commonJS({
             return new F2(e3.getAffectedSopClassUid(), e3.getMessageId());
           }
         }
-        e2.exports = { CCancelRequest: F2, CEchoRequest: R2, CEchoResponse: S2, CFindRequest: f2, CFindResponse: y2, CGetRequest: v, CGetResponse: w2, CMoveRequest: P2, CMoveResponse: A2, Command: g2, CStoreRequest: I2, CStoreResponse: C2, NActionRequest: q2, NActionResponse: D2, NCreateRequest: x2, NCreateResponse: U2, NDeleteRequest: E2, NDeleteResponse: T, NEventReportRequest: b2, NEventReportResponse: O2, NGetRequest: N2, NGetResponse: B2, NSetRequest: M3, NSetResponse: L2, Request: l3, Response: p2 };
+        e2.exports = { CCancelRequest: F2, CEchoRequest: R2, CEchoResponse: S2, CFindRequest: f2, CFindResponse: y2, CGetRequest: v, CGetResponse: w2, CMoveRequest: P2, CMoveResponse: A2, Command: g2, CStoreRequest: I2, CStoreResponse: C2, NActionRequest: q2, NActionResponse: D2, NCreateRequest: x2, NCreateResponse: U2, NDeleteRequest: E2, NDeleteResponse: T, NEventReportRequest: b2, NEventReportResponse: O2, NGetRequest: N2, NGetResponse: B, NSetRequest: M3, NSetResponse: L2, Request: l2, Response: p3 };
       }, 492: (e2) => {
         const t2 = { AAbort: 7, AAssociateAC: 2, AAssociateRJ: 3, AAssociateRQ: 1, AReleaseRP: 6, AReleaseRQ: 5, PDataTF: 4 };
         Object.freeze(t2);
@@ -39351,16 +39351,16 @@ var require_dcmjs_dimse_min = __commonJS({
         Object.freeze(m2);
         const g2 = { 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(g2);
-        const l3 = { 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(l3);
-        const p2 = { 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(p2);
-        const R2 = [p2.ImplicitVRLittleEndian, p2.ExplicitVRLittleEndian];
+        const l2 = { 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(l2);
+        const p3 = { 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(p3);
+        const R2 = [p3.ImplicitVRLittleEndian, p3.ExplicitVRLittleEndian];
         Object.freeze(R2);
         const S2 = { ImplementationClassUid: "1.2.826.0.1.3680043.10.854", ImplementationVersion: "DCMJS-DIMSE-V0.1", MaxPduLength: 262144 };
-        Object.freeze(S2), e2.exports = { AbortReason: o2, AbortSource: r8, CommandFieldType: s2, DefaultImplementation: S2, PresentationContextResult: n2, Priority: u2, RawPduType: t2, RejectReason: d3, RejectResult: a2, RejectSource: c, SopClass: l3, Status: h2, StorageClass: g2, TranscodableTransferSyntaxes: R2, TransferSyntax: p2, Uid: m2, UserIdentityType: i2 };
+        Object.freeze(S2), e2.exports = { AbortReason: o2, AbortSource: r8, CommandFieldType: s2, DefaultImplementation: S2, PresentationContextResult: n2, Priority: u2, RawPduType: t2, RejectReason: d3, RejectResult: a2, RejectSource: c, SopClass: l2, Status: h2, StorageClass: g2, TranscodableTransferSyntaxes: R2, TransferSyntax: p3, Uid: m2, UserIdentityType: i2 };
       }, 825: (e2, t2, s2) => {
-        const { StorageClass: n2, TransferSyntax: i2 } = s2(492), r8 = s2(139), { readFile: o2, readFileSync: a2, writeFile: c, writeFileSync: d3 } = s2(896), { EOL: u2 } = s2(857), h2 = s2(111), { DicomDict: m2, DicomMessage: g2, DicomMetaDictionary: l3, ReadBufferStream: p2, WriteBufferStream: R2 } = h2.data, S2 = h2.log;
+        const { StorageClass: n2, TransferSyntax: i2 } = s2(492), r8 = s2(139), { readFile: o2, readFileSync: a2, writeFile: c, writeFileSync: d3 } = s2(896), { EOL: u2 } = s2(857), h2 = s2(111), { DicomDict: m2, DicomMessage: g2, DicomMetaDictionary: l2, ReadBufferStream: p3, WriteBufferStream: R2 } = h2.data, S2 = h2.log;
         class f2 {
           constructor(e3, t3, s3) {
             s3 = s3 || {}, s3 = { ignoreErrors: true, ...s3 }, S2.level = "error", this.transferSyntaxUid = t3 || i2.ImplicitVRLittleEndian, Buffer.isBuffer(e3) ? this.elements = this._fromElementsBuffer(e3, this.transferSyntaxUid, s3) : this.elements = e3 || {};
@@ -39381,11 +39381,11 @@ var require_dcmjs_dimse_min = __commonJS({
             this.transferSyntaxUid = e3;
           }
           getDenaturalizedDataset(e3, t3) {
-            const s3 = t3 ? l3.denaturalizeDataset(this.getElements(), { ...l3.nameMap, ...t3 }) : l3.denaturalizeDataset(this.getElements()), n3 = new R2();
+            const s3 = t3 ? l2.denaturalizeDataset(this.getElements(), { ...l2.nameMap, ...t3 }) : l2.denaturalizeDataset(this.getElements()), n3 = new R2();
             return g2.write(s3, n3, this.transferSyntaxUid, e3), Buffer.from(n3.getBuffer());
           }
           getDenaturalizedCommandDataset() {
-            const e3 = l3.denaturalizeDataset(this.getElements()), t3 = new R2(), s3 = new R2();
+            const e3 = l2.denaturalizeDataset(this.getElements()), t3 = new R2(), s3 = new R2();
             return g2.write(e3, s3, i2.ImplicitVRLittleEndian, {}), g2.writeTagObject(t3, "00000000", "UL", s3.size, i2.ImplicitVRLittleEndian, {}), t3.concat(s3), Buffer.from(t3.getBuffer());
           }
           static fromFile(e3, t3, s3) {
@@ -39400,13 +39400,13 @@ var require_dcmjs_dimse_min = __commonJS({
             });
           }
           toFile(e3, t3, s3, i3) {
-            const o3 = { _meta: { FileMetaInformationVersion: new Uint8Array([0, 1]).buffer, MediaStorageSOPClassUID: this.getElement("SOPClassUID") || n2.SecondaryCaptureImageStorage, MediaStorageSOPInstanceUID: this.getElement("SOPInstanceUID") || f2.generateDerivedUid(), TransferSyntaxUID: this.getTransferSyntaxUid(), ImplementationClassUID: r8.getImplementationClassUid(), ImplementationVersionName: r8.getImplementationVersion() }, ...this.getElements() }, a3 = l3.denaturalizeDataset(o3._meta), u3 = new m2(a3);
-            u3.dict = s3 ? l3.denaturalizeDataset(o3, { ...l3.nameMap, ...s3 }) : l3.denaturalizeDataset(o3), t3 instanceof Function ? c(e3, Buffer.from(u3.write(i3)), (e4) => {
+            const o3 = { _meta: { FileMetaInformationVersion: new Uint8Array([0, 1]).buffer, MediaStorageSOPClassUID: this.getElement("SOPClassUID") || n2.SecondaryCaptureImageStorage, MediaStorageSOPInstanceUID: this.getElement("SOPInstanceUID") || f2.generateDerivedUid(), TransferSyntaxUID: this.getTransferSyntaxUid(), ImplementationClassUID: r8.getImplementationClassUid(), ImplementationVersionName: r8.getImplementationVersion() }, ...this.getElements() }, a3 = l2.denaturalizeDataset(o3._meta), u3 = new m2(a3);
+            u3.dict = s3 ? l2.denaturalizeDataset(o3, { ...l2.nameMap, ...s3 }) : l2.denaturalizeDataset(o3), t3 instanceof Function ? c(e3, Buffer.from(u3.write(i3)), (e4) => {
               t3(e4 || void 0);
             }) : d3(e3, Buffer.from(u3.write(i3)));
           }
           static generateDerivedUid() {
-            return l3.uid();
+            return l2.uid();
           }
           toString() {
             const e3 = [];
@@ -39414,12 +39414,12 @@ var require_dcmjs_dimse_min = __commonJS({
           }
           static _fromP10Buffer(e3, t3) {
             t3 = t3 || {}, t3 = { ignoreErrors: true, ...t3 };
-            const s3 = g2.readFile(e3.buffer.slice(e3.byteOffset, e3.byteOffset + e3.byteLength), t3), n3 = l3.naturalizeDataset(s3.meta).TransferSyntaxUID, i3 = l3.naturalizeDataset(s3.dict);
+            const s3 = g2.readFile(e3.buffer.slice(e3.byteOffset, e3.byteOffset + e3.byteLength), t3), n3 = l2.naturalizeDataset(s3.meta).TransferSyntaxUID, i3 = l2.naturalizeDataset(s3.dict);
             return new f2(i3, n3);
           }
           _fromElementsBuffer(e3, t3, s3) {
-            const n3 = new p2(e3.buffer.slice(e3.byteOffset, e3.byteOffset + e3.byteLength)), r9 = t3 === i2.ImplicitVRLittleEndian ? i2.ImplicitVRLittleEndian : t3 === i2.ExplicitVRBigEndian ? i2.ExplicitVRBigEndian : i2.ExplicitVRLittleEndian, o3 = g2._read(n3, r9, s3);
-            return l3.naturalizeDataset(o3);
+            const n3 = new p3(e3.buffer.slice(e3.byteOffset, e3.byteOffset + e3.byteLength)), r9 = t3 === i2.ImplicitVRLittleEndian ? i2.ImplicitVRLittleEndian : t3 === i2.ExplicitVRBigEndian ? i2.ExplicitVRBigEndian : i2.ExplicitVRLittleEndian, o3 = g2._read(n3, r9, s3);
+            return l2.naturalizeDataset(o3);
           }
         }
         e2.exports = f2;
@@ -39447,8 +39447,8 @@ var require_dcmjs_dimse_min = __commonJS({
           }
         };
       }, 371: (e2, t2, s2) => {
-        const { Association: n2 } = s2(570), { AAbort: i2, AAssociateAC: r8, AAssociateRJ: o2, AAssociateRQ: a2, AReleaseRP: c, AReleaseRQ: d3, PDataTF: u2, Pdv: h2, RawPdu: m2 } = s2(942), { CommandFieldType: g2, RawPduType: l3, Status: p2, TranscodableTransferSyntaxes: R2 } = s2(492), { CCancelRequest: S2, CEchoRequest: f2, CEchoResponse: y2, CFindRequest: I2, CFindResponse: C2, CGetRequest: P2, CGetResponse: A2, CMoveRequest: v, CMoveResponse: w2, Command: x2, CStoreRequest: U2, CStoreResponse: q2, NActionRequest: D2, NActionResponse: E2, NCreateRequest: T, NCreateResponse: b2, NDeleteRequest: O2, NDeleteResponse: N2, NEventReportRequest: B2, NEventReportResponse: M3, NGetRequest: L2, NGetResponse: F2, NSetRequest: k2, NSetResponse: $2, Response: j } = s2(940), V2 = s2(825), _ = s2(139), G2 = s2(906), z2 = s2(547), { SmartBuffer: Q } = s2(766), { EOL: W2 } = s2(857), J2 = s2(733);
-        class X2 extends J2 {
+        const { Association: n2 } = s2(570), { AAbort: i2, AAssociateAC: r8, AAssociateRJ: o2, AAssociateRQ: a2, AReleaseRP: c, AReleaseRQ: d3, PDataTF: u2, Pdv: h2, RawPdu: m2 } = s2(942), { CommandFieldType: g2, RawPduType: l2, Status: p3, TranscodableTransferSyntaxes: R2 } = s2(492), { CCancelRequest: S2, CEchoRequest: f2, CEchoResponse: y2, CFindRequest: I2, CFindResponse: C2, CGetRequest: P2, CGetResponse: A2, CMoveRequest: v, CMoveResponse: w2, Command: x2, CStoreRequest: U2, CStoreResponse: q2, NActionRequest: D2, NActionResponse: E2, NCreateRequest: T, NCreateResponse: b2, NDeleteRequest: O2, NDeleteResponse: N2, NEventReportRequest: B, NEventReportResponse: M3, NGetRequest: L2, NGetResponse: F2, NSetRequest: k2, NSetResponse: $2, Response: j2 } = s2(940), V2 = s2(825), _ = s2(139), G = s2(906), z2 = s2(547), { SmartBuffer: Q2 } = s2(766), { EOL: W } = s2(857), J2 = s2(733);
+        class X extends J2 {
           constructor() {
             super();
           }
@@ -39460,8 +39460,8 @@ var require_dcmjs_dimse_min = __commonJS({
           _process(e3) {
             if (void 0 === this.receiving) {
               if (this.minimumReceived && (e3 = Buffer.concat([this.minimumReceived, e3], this.minimumReceived.length + e3.length), this.minimumReceived = void 0), e3.length < 6) return void (this.minimumReceived = e3);
-              const t3 = Q.fromBuffer(e3, "ascii"), s3 = t3.readUInt8();
-              if (s3 !== l3.AAssociateRQ && s3 !== l3.AAssociateAC && s3 !== l3.AAssociateRJ && s3 !== l3.PDataTF && s3 !== l3.AReleaseRQ && s3 !== l3.AReleaseRP && s3 !== l3.AAbort) return void this.emit("error", new Error(`Unknown PDU type: ${s3}`));
+              const t3 = Q2.fromBuffer(e3, "ascii"), s3 = t3.readUInt8();
+              if (s3 !== l2.AAssociateRQ && s3 !== l2.AAssociateAC && s3 !== l2.AAssociateRJ && s3 !== l2.PDataTF && s3 !== l2.AReleaseRQ && s3 !== l2.AReleaseRP && s3 !== l2.AAbort) return void this.emit("error", new Error(`Unknown PDU type: ${s3}`));
               t3.readUInt8();
               const n3 = t3.readUInt32BE();
               let i3 = e3.length - 6;
@@ -39483,17 +39483,17 @@ var require_dcmjs_dimse_min = __commonJS({
         }
         e2.exports = class extends J2 {
           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 G2(), 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 G(), this._wrapSocket();
           }
           sendAssociationRequest(e3) {
             this.association = e3;
             const t3 = new a2(this.association).write();
-            this.logId = this.association.getCalledAeTitle(), z2.info(`${this.logId} -> Association request:${W2}${this.association.toString()}`), this._sendPdu(t3);
+            this.logId = this.association.getCalledAeTitle(), z2.info(`${this.logId} -> Association request:${W}${this.association.toString()}`), this._sendPdu(t3);
           }
           sendAssociationAccept() {
             this.association.setImplementationClassUid(_.getImplementationClassUid()), this.association.setImplementationVersion(_.getImplementationVersion()), this.association.setMaxPduLength(Math.min(this.association.getMaxPduLength(), _.getMaxPduLength()));
             const e3 = new r8(this.association).write();
-            z2.info(`${this.logId} -> Association accept:${W2}${this.association.toString()}`), this._sendPdu(e3);
+            z2.info(`${this.logId} -> Association accept:${W}${this.association.toString()}`), this._sendPdu(e3);
           }
           sendAssociationReject(e3, t3, s3) {
             const n3 = new o2(e3, t3, s3), i3 = n3.write();
@@ -39590,29 +39590,29 @@ var require_dcmjs_dimse_min = __commonJS({
             const t3 = new m2(e3);
             try {
               switch (t3.readPdu(), t3.getType()) {
-                case l3.AAssociateRQ:
-                  this.association = new n2(), new a2(this.association).read(t3), this.logId = this.association.getCallingAeTitle(), z2.info(`${this.logId} <- Association request:${W2}${this.association.toString()}`), this.emit("associationRequested", this.association);
+                case l2.AAssociateRQ:
+                  this.association = new n2(), new a2(this.association).read(t3), this.logId = this.association.getCallingAeTitle(), z2.info(`${this.logId} <- Association request:${W}${this.association.toString()}`), this.emit("associationRequested", this.association);
                   break;
-                case l3.AAssociateAC:
-                  new r8(this.association).read(t3), this.logId = this.association.getCalledAeTitle(), z2.info(`${this.logId} <- Association accept:${W2}${this.association.toString()}`), this.emit("associationAccepted", this.association);
+                case l2.AAssociateAC:
+                  new r8(this.association).read(t3), this.logId = this.association.getCalledAeTitle(), z2.info(`${this.logId} <- Association accept:${W}${this.association.toString()}`), this.emit("associationAccepted", this.association);
                   break;
-                case l3.AAssociateRJ: {
+                case l2.AAssociateRJ: {
                   const e4 = new o2();
                   e4.read(t3), z2.info(`${this.logId} <- Association reject ${e4.toString()}`), this.emit("associationRejected", { result: e4.getResult(), source: e4.getSource(), reason: e4.getReason() });
                   break;
                 }
-                case l3.PDataTF: {
+                case l2.PDataTF: {
                   const e4 = new u2();
                   e4.read(t3), this._processPDataTf(e4);
                   break;
                 }
-                case l3.AReleaseRQ:
+                case l2.AReleaseRQ:
                   new d3().read(t3), z2.info(`${this.logId} <- Association release request`), this.emit("associationReleaseRequested");
                   break;
-                case l3.AReleaseRP:
+                case l2.AReleaseRP:
                   new c().read(t3), z2.info(`${this.logId} <- Association release response`), this.emit("associationReleaseResponse");
                   break;
-                case l3.AAbort: {
+                case l2.AAbort: {
                   const e4 = new i2();
                   e4.read(t3), z2.info(`${this.logId} <- Association abort ${e4.toString()}`), this.emit("abort", { source: e4.getSource(), reason: e4.getReason() });
                   break;
@@ -39629,7 +39629,7 @@ var require_dcmjs_dimse_min = __commonJS({
           _processPDataTf(e3) {
             try {
               e3.getPdvs().forEach((e4) => {
-                this.dimseBuffer || (this.dimseBuffer = Q.fromOptions({ encoding: "ascii" })), this.dimseBuffer.writeBuffer(e4.getValue());
+                this.dimseBuffer || (this.dimseBuffer = Q2.fromOptions({ encoding: "ascii" })), this.dimseBuffer.writeBuffer(e4.getValue());
                 const t3 = this.association.getPresentationContext(e4.getPresentationContextId());
                 if (e4.isLastFragment()) if (e4.isCommand()) {
                   const s3 = new x2(new V2(this.dimseBuffer.toBuffer()));
@@ -39683,7 +39683,7 @@ var require_dcmjs_dimse_min = __commonJS({
                       this.dimse = Object.assign(new N2(), s3);
                       break;
                     case g2.NEventReportRequest:
-                      this.dimse = Object.assign(new B2(), s3);
+                      this.dimse = Object.assign(new B(), s3);
                       break;
                     case g2.NEventReportResponse:
                       this.dimse = Object.assign(new M3(), s3);
@@ -39718,9 +39718,9 @@ var require_dcmjs_dimse_min = __commonJS({
             }
           }
           _performDimse(e3, t3) {
-            if (t3 instanceof j) {
+            if (t3 instanceof j2) {
               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() !== p2.Pending && s3.raiseDoneEvent());
+              s3 && (s3.raiseResponseEvent(e4), e4.getStatus() !== p3.Pending && s3.raiseDoneEvent());
             } else t3.getCommandFieldType() === g2.CEchoRequest ? this.emit("cEchoRequest", t3, (t4) => {
               this._sendDimse({ context: e3, command: t4 });
             }) : t3.getCommandFieldType() === g2.CFindRequest ? this.emit("cFindRequest", t3, (t4) => {
@@ -39755,7 +39755,7 @@ var require_dcmjs_dimse_min = __commonJS({
             this.socket.setTimeout(this.connectTimeout), this.socket.on("connect", () => {
               this.connected = true, this.connectedTime = Date.now(), this.emit("connect");
             });
-            const e3 = new X2();
+            const e3 = new X();
             e3.on("pdu", (e4) => {
               this.lastPduTime = Date.now(), this._processPdu(e4);
             }), e3.on("error", (e4) => {
@@ -40214,8 +40214,8 @@ var require_dcmjs_dimse_min = __commonJS({
           }
         }, Pdv: g2, RawPdu: m2 };
       }, 538: (e2, t2, s2) => {
-        const { CEchoResponse: n2, CFindResponse: i2, CGetResponse: r8, CMoveResponse: o2, CStoreResponse: a2, NActionResponse: c, NCreateResponse: d3, NDeleteResponse: u2, NEventReportResponse: h2, NGetResponse: m2, NSetResponse: g2 } = s2(940), l3 = s2(371), p2 = s2(906), R2 = s2(547), S2 = s2(733), f2 = s2(278), y2 = s2(756);
-        e2.exports = { Scp: class extends l3 {
+        const { CEchoResponse: n2, CFindResponse: i2, CGetResponse: r8, CMoveResponse: o2, CStoreResponse: a2, NActionResponse: c, NCreateResponse: d3, NDeleteResponse: u2, NEventReportResponse: h2, NGetResponse: m2, NSetResponse: g2 } = s2(940), l2 = s2(371), p3 = s2(906), R2 = s2(547), S2 = s2(733), f2 = s2(278), y2 = s2(756);
+        e2.exports = { Scp: class extends l2 {
           constructor(e3, t3) {
             super(e3, t3), this.on("associationRequested", (e4) => {
               this.associationRequested(e4);
@@ -40296,7 +40296,7 @@ var require_dcmjs_dimse_min = __commonJS({
           }
         }, Server: class extends S2 {
           constructor(e3) {
-            super(), this.scp = { class: e3 }, this.server = void 0, this.clients = [], this.statistics = new p2();
+            super(), this.scp = { class: e3 }, this.server = void 0, this.clients = [], this.statistics = new p3();
           }
           listen(e3, t3) {
             let s3 = {};
@@ -40357,8 +40357,8 @@ var require_dcmjs_dimse_min = __commonJS({
           }
         };
       }, 237: (e2, t2, s2) => {
-        const { Association: n2, PresentationContext: i2 } = s2(570), { Scp: r8, Server: o2 } = s2(538), { CCancelRequest: a2, CEchoRequest: c, CEchoResponse: d3, CFindRequest: u2, CFindResponse: h2, CGetRequest: m2, CGetResponse: g2, CMoveRequest: l3, CMoveResponse: p2, CStoreRequest: R2, CStoreResponse: S2, NActionRequest: f2, NActionResponse: y2, NCreateRequest: I2, NCreateResponse: C2, NDeleteRequest: P2, NDeleteResponse: A2, NEventReportRequest: v, NEventReportResponse: w2, NGetRequest: x2, NGetResponse: U2, NSetRequest: q2, NSetResponse: D2 } = s2(940), { AbortReason: E2, AbortSource: T, CommandFieldType: b2, PresentationContextResult: O2, Priority: N2, RawPduType: B2, RejectReason: M3, RejectResult: L2, RejectSource: F2, SopClass: k2, Status: $2, StorageClass: j, TransferSyntax: V2, Uid: _, UserIdentityType: G2 } = s2(492), z2 = s2(422), Q = s2(825), W2 = s2(139), J2 = s2(906), X2 = { association: { Association: n2, PresentationContext: i2 }, Client: z2, constants: { AbortReason: E2, AbortSource: T, CommandFieldType: b2, PresentationContextResult: O2, Priority: N2, RawPduType: B2, RejectReason: M3, RejectResult: L2, RejectSource: F2, SopClass: k2, Status: $2, StorageClass: j, TransferSyntax: V2, Uid: _, UserIdentityType: G2 }, Dataset: Q, Implementation: W2, log: s2(547), requests: { CCancelRequest: a2, CEchoRequest: c, CFindRequest: u2, CGetRequest: m2, CMoveRequest: l3, CStoreRequest: R2, NActionRequest: f2, NCreateRequest: I2, NDeleteRequest: P2, NEventReportRequest: v, NGetRequest: x2, NSetRequest: q2 }, responses: { CEchoResponse: d3, CFindResponse: h2, CGetResponse: g2, CMoveResponse: p2, CStoreResponse: S2, NActionResponse: y2, NCreateResponse: C2, NDeleteResponse: A2, NEventReportResponse: w2, NGetResponse: U2, NSetResponse: D2 }, Scp: r8, Server: o2, Statistics: J2, version: s2(837) };
-        e2.exports = X2;
+        const { Association: n2, PresentationContext: i2 } = s2(570), { Scp: r8, Server: o2 } = s2(538), { CCancelRequest: a2, CEchoRequest: c, CEchoResponse: d3, CFindRequest: u2, CFindResponse: h2, CGetRequest: m2, CGetResponse: g2, CMoveRequest: l2, CMoveResponse: p3, CStoreRequest: R2, CStoreResponse: S2, NActionRequest: f2, NActionResponse: y2, NCreateRequest: I2, NCreateResponse: C2, NDeleteRequest: P2, NDeleteResponse: A2, NEventReportRequest: v, NEventReportResponse: w2, NGetRequest: x2, NGetResponse: U2, NSetRequest: q2, NSetResponse: D2 } = s2(940), { AbortReason: E2, AbortSource: T, CommandFieldType: b2, PresentationContextResult: O2, Priority: N2, RawPduType: B, RejectReason: M3, RejectResult: L2, RejectSource: F2, SopClass: k2, Status: $2, StorageClass: j2, TransferSyntax: V2, Uid: _, UserIdentityType: G } = s2(492), z2 = s2(422), Q2 = s2(825), W = s2(139), J2 = s2(906), X = { association: { Association: n2, PresentationContext: i2 }, Client: z2, constants: { AbortReason: E2, AbortSource: T, CommandFieldType: b2, PresentationContextResult: O2, Priority: N2, RawPduType: B, RejectReason: M3, RejectResult: L2, RejectSource: F2, SopClass: k2, Status: $2, StorageClass: j2, TransferSyntax: V2, Uid: _, UserIdentityType: G }, Dataset: Q2, Implementation: W, log: s2(547), requests: { CCancelRequest: a2, CEchoRequest: c, CFindRequest: u2, CGetRequest: m2, CMoveRequest: l2, CStoreRequest: R2, NActionRequest: f2, NCreateRequest: I2, NDeleteRequest: P2, NEventReportRequest: v, NGetRequest: x2, NSetRequest: q2 }, responses: { CEchoResponse: d3, CFindResponse: h2, CGetResponse: g2, CMoveResponse: p3, CStoreResponse: S2, NActionResponse: y2, NCreateResponse: C2, NDeleteResponse: A2, NEventReportResponse: w2, NGetResponse: U2, NSetResponse: D2 }, Scp: r8, Server: o2, Statistics: J2, version: s2(837) };
+        e2.exports = X;
       }, 547: (e2, t2, s2) => {
         const { createLogger: n2, format: i2, transports: r8 } = s2(688), { combine: o2, printf: a2, timestamp: c } = i2, d3 = n2({ format: o2(c(), a2(({ level: e3, message: t3, timestamp: s3 }) => `${s3} -- ${e3.toUpperCase()} -- ${t3}`)), transports: [new r8.Console()] });
         e2.exports = d3;
@@ -40410,7 +40410,7 @@ __export(main_exports, {
 module.exports = __toCommonJS(main_exports);
 
 // ../core/dist/esm/index.mjs
-var Ye = class {
+var Je = class {
   constructor(e, t) {
     this.operator = e;
     this.child = t;
@@ -40419,7 +40419,7 @@ var Ye = class {
     return `${this.operator}(${this.child.toString()})`;
   }
 };
-var Y = class {
+var Z = class {
   constructor(e, t, n) {
     this.operator = e;
     this.left = t;
@@ -40429,7 +40429,7 @@ var Y = class {
     return `${this.left.toString()} ${this.operator} ${this.right.toString()}`;
   }
 };
-var Ze = class {
+var Ye = class {
   constructor() {
     this.prefixParselets = {};
     this.infixParselets = {};
@@ -40505,15 +40505,15 @@ var zt = class {
   }
 };
 var Jt = "ok";
-var Xe = "created";
+var Ze = "created";
 var Zt = "not-modified";
 var Xt = "not-found";
 var tr = "unauthorized";
-var et = "accepted";
+var Xe = "accepted";
 var cn = { resourceType: "OperationOutcome", id: Xt, issue: [{ severity: "error", code: "not-found", details: { text: "Not found" } }] };
-var Ee = { resourceType: "OperationOutcome", id: tr, issue: [{ severity: "error", code: "login", details: { text: "Unauthorized" } }] };
-var un = { ...Ee, issue: [...Ee.issue, { severity: "error", code: "expired", details: { text: "Token expired" } }] };
-var rr = { ...Ee, issue: [...Ee.issue, { severity: "error", code: "invalid", details: { text: "Token not issued for this audience" } }] };
+var be = { resourceType: "OperationOutcome", id: tr, issue: [{ severity: "error", code: "login", details: { text: "Unauthorized" } }] };
+var un = { ...be, issue: [...be.issue, { severity: "error", code: "expired", details: { text: "Token expired" } }] };
+var rr = { ...be, issue: [...be.issue, { severity: "error", code: "invalid", details: { text: "Token not issued for this audience" } }] };
 function E(r7, e) {
   return { resourceType: "OperationOutcome", issue: [{ severity: "error", code: "invalid", details: { text: r7 }, ...e ? { expression: [e] } : void 0 }] };
 }
@@ -40523,22 +40523,22 @@ function h(r7) {
 function ln(r7) {
   return { resourceType: "OperationOutcome", issue: [{ severity: "error", code: "exception", details: { text: "Internal server error" }, diagnostics: r7.toString() }] };
 }
-function be(r7) {
+function Re(r7) {
   return typeof r7 == "object" && r7 !== null && r7.resourceType === "OperationOutcome";
 }
 function nr(r7) {
-  return r7.id === Jt || r7.id === Xe || r7.id === Zt || r7.id === et;
+  return r7.id === Jt || r7.id === Ze || r7.id === Zt || r7.id === Xe;
 }
 var d = class extends Error {
   constructor(e, t) {
     super(pn(e)), this.outcome = e, this.cause = t;
   }
 };
-function tt(r7) {
-  return r7 instanceof d ? r7.outcome : be(r7) ? r7 : E(Re(r7));
+function et(r7) {
+  return r7 instanceof d ? r7.outcome : Re(r7) ? r7 : E(Ce(r7));
 }
-function Re(r7) {
-  return r7 ? typeof r7 == "string" ? r7 : r7 instanceof Error ? r7.message : be(r7) ? pn(r7) : typeof r7 == "object" && "code" in r7 && typeof r7.code == "string" ? r7.code : JSON.stringify(r7) : "Unknown error";
+function Ce(r7) {
+  return r7 ? typeof r7 == "string" ? r7 : r7 instanceof Error ? r7.message : Re(r7) ? pn(r7) : typeof r7 == "object" && "code" in r7 && typeof r7.code == "string" ? r7.code : JSON.stringify(r7) : "Unknown error";
 }
 function pn(r7) {
   let e = r7.issue?.map(eo) ?? [];
@@ -40561,7 +40561,7 @@ var hn = { Element: { elements: { id: { type: [{ code: "string" }] }, extension:
 function ar(r7) {
   return new or(r7).parse();
 }
-var ue = mn(hn);
+var le = mn(hn);
 var cr = /* @__PURE__ */ Object.create(null);
 var yn = /* @__PURE__ */ Object.create(null);
 var io = { "http://hl7.org/fhir/StructureDefinition/MoneyQuantity": "MoneyQuantity", "http://hl7.org/fhir/StructureDefinition/SimpleQuantity": "SimpleQuantity", "http://hl7.org/fhir/uv/sql-on-fhir/StructureDefinition/ViewDefinition": "ViewDefinition" };
@@ -40570,26 +40570,27 @@ function Tn(r7) {
   return e = yn[r7], e || (e = yn[r7] = /* @__PURE__ */ Object.create(null)), e;
 }
 function ur(r7) {
-  let e = Array.isArray(r7) ? r7 : r7.entry?.map((t) => t.resource) ?? [];
-  for (let t of e) lr(t);
+  let t = (Array.isArray(r7) ? r7 : r7.entry?.map((n) => n.resource) ?? []).filter((n) => n?.resourceType === "StructureDefinition");
+  Pn(t);
+  for (let n of t) lr(n);
 }
 function lr(r7) {
   if (!r7?.name) throw new Error("Failed loading StructureDefinition from bundle");
   if (r7.resourceType !== "StructureDefinition") return;
   let e = ar(r7), t = io[r7.url], n, i;
-  t ? (n = ue, i = t) : r7.url === `http://hl7.org/fhir/StructureDefinition/${r7.type}` || r7.url === `https://medplum.com/fhir/StructureDefinition/${r7.type}` || r7.type?.startsWith("http://") || r7.type?.startsWith("https://") ? (n = ue, i = r7.type) : (n = Tn(r7.url), i = r7.type), n[i] = e;
+  t ? (n = le, i = t) : r7.url === `http://hl7.org/fhir/StructureDefinition/${r7.type}` || r7.url === `https://medplum.com/fhir/StructureDefinition/${r7.type}` || r7.type?.startsWith("http://") || r7.type?.startsWith("https://") ? (n = le, i = r7.type) : (n = Tn(r7.url), i = r7.type), n[i] = e;
   for (let o of e.innerTypes) o.parentType = e, n[o.name] = o;
   cr[r7.url] = e;
 }
 function En(r7) {
-  return !!ue[r7];
+  return !!le[r7];
 }
 function Le(r7, e) {
   if (e) {
     let t = Tn(e)[r7];
     if (t) return t;
   }
-  return ue[r7];
+  return le[r7];
 }
 function Rn(r7) {
   return !!cr[r7];
@@ -40597,7 +40598,7 @@ function Rn(r7) {
 var or = 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, path: this.root.path, title: e.title, type: e.type, url: e.url, kind: e.kind, description: co(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, path: this.root.path, title: e.title, type: e.type, url: e.url, version: e.version, kind: e.kind, description: co(e), elements: {}, constraints: this.parseElementDefinition(this.root).constraints, innerTypes: [], summaryProperties: /* @__PURE__ */ new Set(), mandatoryProperties: /* @__PURE__ */ new Set() }, this.innerTypes = [];
   }
   parse() {
     let e = this.next();
@@ -40630,12 +40631,12 @@ var or = class {
     return this.checkFieldExit(), this.innerTypes.length > 0 && (this.resourceSchema.innerTypes = this.innerTypes), this.resourceSchema;
   }
   checkFieldEnter(e, t) {
-    this.isInnerType(e) && this.enterInnerType(e), this.slicingContext && !Ce(this.slicingContext.path, e?.path) && (this.slicingContext = void 0), e.slicing && !this.slicingContext && this.enterSlice(e, t);
+    this.isInnerType(e) && this.enterInnerType(e), this.slicingContext && !Pe(this.slicingContext.path, e?.path) && (this.slicingContext = void 0), e.slicing && !this.slicingContext && this.enterSlice(e, t);
   }
   enterInnerType(e) {
-    for (; this.backboneContext && !Ce(this.backboneContext?.path, e.path); ) this.innerTypes.push(this.backboneContext.type), this.backboneContext = this.backboneContext.parent;
+    for (; this.backboneContext && !Pe(this.backboneContext?.path, e.path); ) this.innerTypes.push(this.backboneContext.type), this.backboneContext = this.backboneContext.parent;
     let t = sr(e);
-    this.backboneContext = { type: { name: t, type: t, path: e.path, title: e.label, description: e.definition, elements: {}, constraints: this.parseElementDefinition(e).constraints, innerTypes: [] }, path: e.path, parent: Ce(this.backboneContext?.path, e.path) ? this.backboneContext : this.backboneContext?.parent };
+    this.backboneContext = { type: { name: t, type: t, path: e.path, title: e.label, description: e.definition, elements: {}, constraints: this.parseElementDefinition(e).constraints, innerTypes: [] }, path: e.path, parent: Pe(this.backboneContext?.path, e.path) ? this.backboneContext : this.backboneContext?.parent };
   }
   enterSlice(e, t) {
     ao(e) && !this.peek()?.sliceName || (t.slicing = { discriminator: (e.slicing?.discriminator ?? []).map((n) => {
@@ -40644,9 +40645,9 @@ var or = class {
     }), 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 && !Ce(this.backboneContext.path, e?.path)) if (this.backboneContext.parent) do
+    if (this.backboneContext && !Pe(this.backboneContext.path, e?.path)) if (this.backboneContext.parent) do
       this.innerTypes.push(this.backboneContext.type), this.backboneContext = this.backboneContext.parent;
-    while (this.backboneContext && !Ce(this.backboneContext.path, e?.path));
+    while (this.backboneContext && !Pe(this.backboneContext.path, e?.path));
     else this.innerTypes.push(this.backboneContext.type), this.backboneContext = void 0;
   }
   next() {
@@ -40665,7 +40666,7 @@ var or = class {
   }
   isInnerType(e) {
     let t = this.peek();
-    return !!(Ce(e?.path, t?.path) && e.type?.some((n) => ["BackboneElement", "Element"].includes(n.code)));
+    return !!(Pe(e?.path, t?.path) && e.type?.some((n) => ["BackboneElement", "Element"].includes(n.code)));
   }
   parseSliceStart(e) {
     if (!this.slicingContext) throw new Error(`Invalid slice start before discriminator: ${e.sliceName} (${e.id})`);
@@ -40674,7 +40675,7 @@ var or = class {
   parseElementDefinitionType(e) {
     return (e.type ?? []).map((t) => {
       let n;
-      return (t.code === "BackboneElement" || t.code === "Element") && (n = sr(e)), n || (n = X(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 = sr(e)), n || (n = ee(t, "http://hl7.org/fhir/StructureDefinition/structuredefinition-fhir-type")?.valueUrl), n || (n = t.code ?? ""), { code: n, targetProfile: t.targetProfile, profile: t.profile };
     });
   }
   parseElementDefinition(e) {
@@ -40691,7 +40692,7 @@ function ir(r7, e = "") {
 function so(r7, e) {
   return r7 ? e && r7.startsWith(e) ? r7.substring(e.length + 1) : r7 : "";
 }
-function Ce(r7, e) {
+function Pe(r7, e) {
   return !r7 || !e ? false : e.startsWith(r7 + ".") || e === r7;
 }
 function vn(r7) {
@@ -40705,17 +40706,17 @@ function co(r7) {
   let e = r7.description;
   return e?.startsWith(`Base StructureDefinition for ${r7.name} Type: `) && (e = e.substring(`Base StructureDefinition for ${r7.name} Type: `.length)), e;
 }
-var ot = { base64Binary: /^([A-Za-z\d+/]{4})*([A-Za-z\d+/]{2}==|[A-Za-z\d+/]{3}=)?$/, canonical: /^\S*$/, code: /^[^\s]+( [^\s]+)*$/, date: /^(\d(\d(\d[1-9]|[1-9]0)|[1-9]00)|[1-9]000)(-(0[1-9]|1[0-2])(-(0[1-9]|[1-2]\d|3[0-1]))?)?$/, dateTime: /^(\d(\d(\d[1-9]|[1-9]0)|[1-9]00)|[1-9]000)(-(0[1-9]|1[0-2])(-(0[1-9]|[1-2]\d|3[0-1])(T([01]\d|2[0-3])(:[0-5]\d:([0-5]\d|60)(\.\d{1,9})?)?)?)?(Z|[+-]((0\d|1[0-3]):[0-5]\d|14:00)?)?)?$/, id: /^[A-Za-z0-9\-.]{1,64}$/, instant: /^(\d(\d(\d[1-9]|[1-9]0)|[1-9]00)|[1-9]000)-(0[1-9]|1[0-2])-(0[1-9]|[1-2]\d|3[0-1])T([01]\d|2[0-3]):[0-5]\d:([0-5]\d|60)(\.\d{1,9})?(Z|[+-]((0\d|1[0-3]):[0-5]\d|14:00))$/, markdown: /^[\s\S]+$/, oid: /^urn:oid:[0-2](\.(0|[1-9]\d*))+$/, string: /^[\s\S]+$/, time: /^([01]\d|2[0-3]):[0-5]\d:([0-5]\d|60)(\.\d{1,9})?$/, uri: /^\S*$/, url: /^\S*$/, uuid: /^urn:uuid:[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/, xhtml: /.*/ };
+var it = { base64Binary: /^([A-Za-z\d+/]{4})*([A-Za-z\d+/]{2}==|[A-Za-z\d+/]{3}=)?$/, canonical: /^\S*$/, code: /^[^\s]+( [^\s]+)*$/, date: /^(\d(\d(\d[1-9]|[1-9]0)|[1-9]00)|[1-9]000)(-(0[1-9]|1[0-2])(-(0[1-9]|[1-2]\d|3[0-1]))?)?$/, dateTime: /^(\d(\d(\d[1-9]|[1-9]0)|[1-9]00)|[1-9]000)(-(0[1-9]|1[0-2])(-(0[1-9]|[1-2]\d|3[0-1])(T([01]\d|2[0-3])(:[0-5]\d:([0-5]\d|60)(\.\d{1,9})?)?)?)?(Z|[+-]((0\d|1[0-3]):[0-5]\d|14:00)?)?)?$/, id: /^[A-Za-z0-9\-.]{1,64}$/, instant: /^(\d(\d(\d[1-9]|[1-9]0)|[1-9]00)|[1-9]000)-(0[1-9]|1[0-2])-(0[1-9]|[1-2]\d|3[0-1])T([01]\d|2[0-3]):[0-5]\d:([0-5]\d|60)(\.\d{1,9})?(Z|[+-]((0\d|1[0-3]):[0-5]\d|14:00))$/, markdown: /^[\s\S]+$/, oid: /^urn:oid:[0-2](\.(0|[1-9]\d*))+$/, string: /^[\s\S]+$/, time: /^([01]\d|2[0-3]):[0-5]\d:([0-5]\d|60)(\.\d{1,9})?$/, uri: /^\S*$/, url: /^\S*$/, uuid: /^urn:uuid:[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/, xhtml: /.*/ };
 function f(r7) {
-  return [{ type: l.boolean, value: r7 }];
+  return [{ type: p.boolean, value: r7 }];
 }
 function g(r7) {
-  return r7 == null ? { type: "undefined", value: void 0 } : Number.isSafeInteger(r7) ? { type: l.integer, value: r7 } : typeof r7 == "number" ? { type: l.decimal, value: r7 } : typeof r7 == "boolean" ? { type: l.boolean, value: r7 } : typeof r7 == "string" ? { type: l.string, value: r7 } : k(r7) ? { type: l.Quantity, value: r7 } : I(r7) ? { type: r7.resourceType, value: r7 } : Sr(r7) ? { type: l.CodeableConcept, value: r7 } : Tr(r7) ? { type: l.Coding, value: r7 } : { type: l.BackboneElement, value: r7 };
+  return r7 == null ? { type: "undefined", value: void 0 } : Number.isSafeInteger(r7) ? { type: p.integer, value: r7 } : typeof r7 == "number" ? { type: p.decimal, value: r7 } : typeof r7 == "boolean" ? { type: p.boolean, value: r7 } : typeof r7 == "string" ? { type: p.string, value: r7 } : V(r7) ? { type: p.Quantity, value: r7 } : k(r7) ? { type: r7.resourceType, value: r7 } : Sr(r7) ? { type: p.CodeableConcept, value: r7 } : Tr(r7) ? { type: p.Coding, value: r7 } : { type: p.BackboneElement, value: r7 };
 }
 function N(r7) {
   return r7.length === 0 ? false : !!r7[0].value;
 }
-function W(r7, e) {
+function $(r7, e) {
   if (r7.length !== 0) {
     if (r7.length === 1 && (!e || r7[0].type === e)) return r7[0];
     throw new Error(`Expected singleton of type ${e}, but found ${JSON.stringify(r7)}`);
@@ -40723,28 +40724,28 @@ function W(r7, e) {
 }
 function P(r7, e, t) {
   if (!r7.value) return;
-  let n = ct(r7.type, e, t?.profileUrl);
+  let n = at(r7.type, e, t?.profileUrl);
   return n ? To(r7, e, n) : So(r7, e);
 }
 function To(r7, e, t) {
   let n = r7.value, i = t.type;
   if (!i || i.length === 0) return;
   let o, s = "undefined", a2, c = t.path.lastIndexOf("."), u2 = t.path.substring(c + 1);
-  for (let p2 of i) {
-    let m2 = u2.replace("[x]", O(p2.code));
+  for (let l2 of i) {
+    let m2 = u2.replace("[x]", I(l2.code));
     if (o = n[m2], a2 = n["_" + m2], o !== void 0 || a2 !== void 0) {
-      s = p2.code;
+      s = l2.code;
       break;
     }
   }
   if (a2) if (Array.isArray(o)) {
     o = o.slice();
-    for (let p2 = 0; p2 < Math.max(o.length, a2.length); p2++) o[p2] = kn(o[p2], a2[p2]);
-  } else o = kn(o, a2);
-  if (!S(o)) return (s === "Element" || s === "BackboneElement") && (s = t.type[0].code), Array.isArray(o) ? o.map((p2) => wn(p2, s)) : wn(o, s);
+    for (let l2 = 0; l2 < Math.max(o.length, a2.length); l2++) o[l2] = Vn(o[l2], a2[l2]);
+  } else o = Vn(o, a2);
+  if (!S(o)) return (s === "Element" || s === "BackboneElement") && (s = t.type[0].code), Array.isArray(o) ? o.map((l2) => An(l2, s)) : An(o, s);
 }
-function wn(r7, e) {
-  return e === "Resource" && I(r7) && (e = r7.resourceType), { type: e, value: r7 };
+function An(r7, e) {
+  return e === "Resource" && k(r7) && (e = r7.resourceType), { type: e, value: r7 };
 }
 function So(r7, e) {
   let t = r7.value;
@@ -40755,8 +40756,8 @@ function So(r7, e) {
     Array.isArray(i) ? n = i.map(g) : n = g(i);
   } else {
     let i = e.endsWith("[x]") ? e.substring(0, e.length - 3) : e;
-    for (let o of Object.values(l)) {
-      let s = i + O(o);
+    for (let o of Object.values(p)) {
+      let s = i + I(o);
       if (s in t) {
         let a2 = t[s];
         Array.isArray(a2) ? n = a2.map((c) => ({ type: o, value: c })) : n = { type: o, value: a2 };
@@ -40769,7 +40770,7 @@ function So(r7, e) {
   } else if (S(n)) return;
   return n;
 }
-function st(r7) {
+function ot(r7) {
   let e = [];
   for (let t of r7) {
     let n = false;
@@ -40781,31 +40782,31 @@ function st(r7) {
   }
   return e;
 }
-function Vn(r7) {
+function Dn(r7) {
   return f(!N(r7));
 }
-function Dn(r7, e) {
+function Mn(r7, e) {
   return r7.length === 0 || e.length === 0 ? [] : r7.length !== e.length ? f(false) : f(r7.every((t, n) => N(gr(t, e[n]))));
 }
-function Mn(r7, e) {
+function _n(r7, e) {
   return r7.length === 0 || e.length === 0 ? [] : r7.length !== e.length ? f(true) : f(r7.some((t, n) => !N(gr(t, e[n]))));
 }
 function gr(r7, e) {
   let t = r7.value?.valueOf(), n = e.value?.valueOf();
-  return typeof t == "number" && typeof n == "number" ? f(Math.abs(t - n) < 1e-8) : k(t) && k(n) ? f(Ln(t, n)) : f(typeof t == "object" && typeof n == "object" ? vr(r7, e) : t === n);
+  return typeof t == "number" && typeof n == "number" ? f(Math.abs(t - n) < 1e-8) : V(t) && V(n) ? f(Fn(t, n)) : f(typeof t == "object" && typeof n == "object" ? vr(r7, e) : t === n);
 }
 function xr(r7, e) {
-  return r7.length === 0 && e.length === 0 ? f(true) : r7.length !== e.length ? f(false) : (r7.sort(An), e.sort(An), f(r7.every((t, n) => N(Eo(t, e[n])))));
+  return r7.length === 0 && e.length === 0 ? f(true) : r7.length !== e.length ? f(false) : (r7.sort(On), e.sort(On), f(r7.every((t, n) => N(Eo(t, e[n])))));
 }
 function Eo(r7, e) {
   let { type: t, value: n } = r7, { type: i, value: o } = e, s = n?.valueOf(), a2 = o?.valueOf();
-  return typeof s == "number" && typeof a2 == "number" ? f(Math.abs(s - a2) < 0.01) : k(s) && k(a2) ? f(Ln(s, a2)) : f(t === "Coding" && i === "Coding" ? typeof s != "object" || typeof a2 != "object" ? false : s.code === a2.code && s.system === a2.system : typeof s == "object" && typeof a2 == "object" ? vr({ ...s, id: void 0 }, { ...a2, id: void 0 }) : typeof s == "string" && typeof a2 == "string" ? s.toLowerCase() === a2.toLowerCase() : s === a2);
+  return typeof s == "number" && typeof a2 == "number" ? f(Math.abs(s - a2) < 0.01) : V(s) && V(a2) ? f(Fn(s, a2)) : f(t === "Coding" && i === "Coding" ? typeof s != "object" || typeof a2 != "object" ? false : s.code === a2.code && s.system === a2.system : typeof s == "object" && typeof a2 == "object" ? vr({ ...s, id: void 0 }, { ...a2, id: void 0 }) : typeof s == "string" && typeof a2 == "string" ? s.toLowerCase() === a2.toLowerCase() : s === a2);
 }
-function An(r7, e) {
+function On(r7, e) {
   let t = r7.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 at(r7, e) {
+function st(r7, e) {
   let { value: t } = r7;
   if (t == null) return false;
   switch (e) {
@@ -40815,32 +40816,32 @@ function at(r7, e) {
     case "Integer":
       return typeof t == "number";
     case "Date":
-      return _n(t);
+      return Nn(t);
     case "DateTime":
-      return we(t);
+      return Ae(t);
     case "Time":
       return typeof t == "string" && !!/^T\d/.exec(t);
     case "Period":
-      return Nn(t);
+      return Ln(t);
     case "Quantity":
-      return k(t);
+      return V(t);
     default:
-      return typeof t == "object" && t?.resourceType === e;
+      return r7.type === e || typeof t == "object" && t?.resourceType === e;
   }
 }
-function _n(r7) {
-  return typeof r7 == "string" && !!ot.date.exec(r7);
+function Nn(r7) {
+  return typeof r7 == "string" && !!it.date.exec(r7);
 }
-function we(r7) {
-  return typeof r7 == "string" && !!ot.dateTime.exec(r7);
+function Ae(r7) {
+  return typeof r7 == "string" && !!it.dateTime.exec(r7);
 }
-function Nn(r7) {
-  return !!(r7 && typeof r7 == "object" && ("start" in r7 && we(r7.start) || "end" in r7 && we(r7.end)));
+function Ln(r7) {
+  return !!(r7 && typeof r7 == "object" && ("start" in r7 && Ae(r7.start) || "end" in r7 && Ae(r7.end)));
 }
-function k(r7) {
+function V(r7) {
   return !!(r7 && typeof r7 == "object" && "value" in r7 && typeof r7.value == "number");
 }
-function Ln(r7, e) {
+function Fn(r7, e) {
   return Math.abs(r7.value - e.value) < 0.01 && (r7.unit === e.unit || r7.code === e.code || r7.unit === e.code || r7.code === e.unit);
 }
 function vr(r7, e) {
@@ -40848,16 +40849,16 @@ function vr(r7, e) {
   if (t.length !== n.length) return false;
   for (let i of t) {
     let o = r7[i], s = e[i];
-    if (In(o) && In(s)) {
+    if (kn(o) && kn(s)) {
       if (!vr(o, s)) return false;
     } else if (o !== s) return false;
   }
   return true;
 }
-function In(r7) {
+function kn(r7) {
   return r7 !== null && typeof r7 == "object";
 }
-function kn(r7, e) {
+function Vn(r7, e) {
   if (e) {
     if (typeof e != "object") throw new Error("Primitive extension must be an object");
     return bo(r7 ?? {}, e);
@@ -40867,15 +40868,15 @@ function kn(r7, e) {
 function bo(r7, e) {
   return delete e.__proto__, delete e.constructor, Object.assign(r7, e);
 }
-function te(r7) {
-  let e = pe(r7), t = Co(r7);
+function re(r7) {
+  let e = de(r7), t = Co(r7);
   return t === e ? { reference: e } : { reference: e, display: t };
 }
-function pe(r7) {
-  return le(r7) ? r7.reference : `${r7.resourceType}/${r7.id}`;
-}
 function de(r7) {
-  if (r7) return le(r7) ? r7.reference.split("/")[1] : r7.id;
+  return pe(r7) ? r7.reference : `${r7.resourceType}/${r7.id}`;
+}
+function fe(r7) {
+  if (r7) return pe(r7) ? r7.reference.split("/")[1] : r7.id;
 }
 function Ro(r7) {
   return r7.resourceType === "Patient" || r7.resourceType === "Practitioner" || r7.resourceType === "RelatedPerson";
@@ -40898,7 +40899,7 @@ function Co(r7) {
     if (Array.isArray(e) && (e = e[0]), Sr(e)) return Be(e);
     if (No(e)) return e.text;
   }
-  return pe(r7);
+  return de(r7);
 }
 function Po(r7) {
   let e = r7.name;
@@ -40908,24 +40909,24 @@ function wo(r7) {
   let e = r7.deviceName;
   if (e && e.length > 0) return e[0].name;
 }
-function ut(r7, e) {
+function ct(r7, e) {
   let t = new Date(r7);
   t.setUTCHours(0, 0, 0, 0);
   let n = e ? new Date(e) : /* @__PURE__ */ new Date();
   n.setUTCHours(0, 0, 0, 0);
-  let i = t.getUTCFullYear(), o = t.getUTCMonth(), s = t.getUTCDate(), a2 = n.getUTCFullYear(), c = n.getUTCMonth(), u2 = n.getUTCDate(), p2 = a2 - i;
-  (c < o || c === o && u2 < s) && p2--;
+  let i = t.getUTCFullYear(), o = t.getUTCMonth(), s = t.getUTCDate(), a2 = n.getUTCFullYear(), c = n.getUTCMonth(), u2 = n.getUTCDate(), l2 = a2 - i;
+  (c < o || c === o && u2 < s) && l2--;
   let m2 = a2 * 12 + c - (i * 12 + o);
   u2 < s && m2--;
   let x2 = Math.floor((n.getTime() - t.getTime()) / (1e3 * 60 * 60 * 24));
-  return { years: p2, months: m2, days: x2 };
+  return { years: l2, months: m2, days: x2 };
 }
-function X(r7, ...e) {
+function ee(r7, ...e) {
   let t = r7;
   for (let n = 0; n < e.length && t; n++) t = t?.extension?.find((i) => i.url === e[n]);
   return t;
 }
-function lt(r7, e) {
+function ut(r7, e) {
   return JSON.stringify(r7, Oo, e ? 2 : void 0) ?? "";
 }
 function Oo(r7, e) {
@@ -40937,19 +40938,19 @@ function Io(r7) {
 function S(r7) {
   if (r7 == null) return true;
   let e = typeof r7;
-  return e === "string" || e === "object" ? !K(r7) : false;
+  return e === "string" || e === "object" ? !z(r7) : false;
 }
-function K(r7) {
+function z(r7) {
   if (r7 == null) return false;
   let e = typeof r7;
   return e === "string" && r7 !== "" || e === "object" && ("length" in r7 && r7.length > 0 || Object.keys(r7).length > 0);
 }
-function ee(r7, e, t) {
+function te(r7, e, t) {
   return r7 === e || S(r7) && S(e) ? true : S(r7) || S(e) ? false : Array.isArray(r7) && Array.isArray(e) ? ko(r7, e) : Array.isArray(r7) || Array.isArray(e) ? false : R(r7) && R(e) ? Vo(r7, e, t) : (R(r7) || R(e), false);
 }
 function ko(r7, e) {
   if (r7.length !== e.length) return false;
-  for (let t = 0; t < r7.length; t++) if (!ee(r7[t], e[t])) return false;
+  for (let t = 0; t < r7.length; t++) if (!te(r7[t], e[t])) return false;
   return true;
 }
 function Vo(r7, e, t) {
@@ -40957,14 +40958,14 @@ function Vo(r7, e, t) {
   Object.keys(r7).forEach((i) => n.add(i)), Object.keys(e).forEach((i) => n.add(i)), t === "meta" && (n.delete("versionId"), n.delete("lastUpdated"), n.delete("author"));
   for (let i of n) {
     let o = r7[i], s = e[i];
-    if (!ee(o, s, i)) return false;
+    if (!te(o, s, i)) return false;
   }
   return true;
 }
 function R(r7) {
   return r7 !== null && typeof r7 == "object";
 }
-function qn(r7) {
+function jn(r7) {
   return r7.every(_o);
 }
 function _o(r7) {
@@ -40981,72 +40982,76 @@ function No(r7) {
 }
 var Wn = [];
 for (let r7 = 0; r7 < 256; r7++) Wn.push(r7.toString(16).padStart(2, "0"));
-function jn(r7) {
-  let e = Gn(r7), t = new Uint8Array(e), n = new Array(t.length);
+function $n(r7) {
+  let e = Hn(r7), t = new Uint8Array(e), n = new Array(t.length);
   for (let i = 0; i < t.length; i++) n[i] = Wn[t[i]];
   return n.join("");
 }
-function $n(r7) {
-  let e = Gn(r7), t = new Uint8Array(e), n = new Array(t.length);
+function Gn(r7) {
+  let e = Hn(r7), t = new Uint8Array(e), n = new Array(t.length);
   for (let i = 0; i < t.length; i++) n[i] = String.fromCharCode(t[i]);
   return window.btoa(n.join(""));
 }
-function Gn(r7) {
+function Hn(r7) {
   return ArrayBuffer.isView(r7) ? r7.buffer : r7;
 }
-function O(r7) {
+function I(r7) {
   return r7 ? r7.charAt(0).toUpperCase() + r7.substring(1) : "";
 }
 var Rr = (r7) => new Promise((e) => {
   setTimeout(e, r7);
 });
-function pt(r7) {
+function lt(r7) {
   return r7.sort((e, t) => e.localeCompare(t));
 }
 function Pr(r7) {
   return r7.endsWith("/") ? r7 : r7 + "/";
 }
-function Wo(r7) {
+function jo(r7) {
   return r7.startsWith("/") ? r7.slice(1) : r7;
 }
-function B(r7, e) {
-  return new URL(Wo(e), Pr(r7.toString())).toString();
+function q(r7, e) {
+  return new URL(jo(e), Pr(r7.toString())).toString();
 }
-function zn(r7, e) {
-  return B(r7, e).toString().replace("http://", "ws://").replace("https://", "wss://");
+function Jn(r7, e) {
+  return q(r7, e).toString().replace("http://", "ws://").replace("https://", "wss://");
 }
-function Jn(r7) {
+function Yn(r7) {
   return typeof r7 == "object" && !Array.isArray(r7) && !(r7 instanceof URLSearchParams) && (r7 = Object.fromEntries(Object.entries(r7).filter((e) => e[1] !== void 0))), new URLSearchParams(r7).toString();
 }
-var jo = /^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-_]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-_]*[A-Za-z0-9])$/;
-function ul(r7) {
-  return jo.test(r7);
+var Wo = /^(([a-zA-Z0-9]|[a-zA-Z0-9][a-zA-Z0-9\-_]*[a-zA-Z0-9])\.)*([A-Za-z0-9]|[A-Za-z0-9][A-Za-z0-9\-_]*[A-Za-z0-9])$/;
+function ll(r7) {
+  return Wo.test(r7);
 }
 function qe(r7, e) {
   let t = [];
   if (r7.prefix && e?.prefix !== false && t.push(...r7.prefix), r7.given && t.push(...r7.given), r7.family && t.push(r7.family), r7.suffix && e?.suffix !== false && t.push(...r7.suffix), r7.use && (e?.all || e?.use) && t.push("[" + r7.use + "]"), t.length === 0) {
-    let n = me(r7.text);
+    let n = he(r7.text);
     if (n) return n;
   }
   return t.join(" ").trim();
 }
 function Be(r7) {
   if (!r7) return "";
-  let e = me(r7.text);
+  let e = he(r7.text);
   return e || (r7.coding ? r7.coding.map((t) => Zn(t)).join(", ") : "");
 }
 function Zn(r7, e) {
-  let t = me(r7?.display);
+  let t = he(r7?.display);
   if (t) {
-    let n = e ? me(r7?.code) : void 0;
+    let n = e ? he(r7?.code) : void 0;
     return `${t}${n ? " (" + n + ")" : ""}`;
   }
-  return me(r7?.code) ?? "";
+  return he(r7?.code) ?? "";
 }
-function me(r7) {
+function he(r7) {
   return typeof r7 == "string" ? r7 : void 0;
 }
-var l = { 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" };
+var p = { 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 Pn(r7) {
+  let e = Array.isArray(r7) ? r7 : r7.entry?.map((t) => t.resource) ?? [];
+  for (let t of e) t?.resourceType === "StructureDefinition" && t.kind === "resource" && ti(t.type);
+}
 function ti(r7) {
   let e = L.types[r7];
   return e || (e = { searchParamsDetails: {} }, L.types[r7] = e), e.searchParams || (e.searchParams = { _id: { base: [r7], code: "_id", type: "token", expression: r7 + ".id" }, _lastUpdated: { base: [r7], code: "_lastUpdated", type: "date", expression: r7 + ".meta.lastUpdated" }, _compartment: { base: [r7], code: "_compartment", type: "reference", expression: r7 + ".meta.compartment" }, _profile: { base: [r7], code: "_profile", type: "uri", expression: r7 + ".meta.profile" }, _security: { base: [r7], code: "_security", type: "token", expression: r7 + ".meta.security" }, _source: { base: [r7], code: "_source", type: "uri", expression: r7 + ".meta.source" }, _tag: { base: [r7], code: "_tag", type: "token", expression: r7 + ".meta.tag" } }), e;
@@ -41062,9 +41067,9 @@ function sr(r7) {
   return e === "BackboneElement" || e === "Element" ? es((r7.base?.path ?? r7.path)?.split(".")) : e;
 }
 function es(r7) {
-  return r7.length === 1 ? r7[0] : r7.map(O).join("");
+  return r7.length === 1 ? r7[0] : r7.map(I).join("");
 }
-function ct(r7, e, t) {
+function at(r7, e, t) {
   let n = Le(r7, t);
   if (n) return is(n.elements, e);
 }
@@ -41079,14 +41084,14 @@ function is(r7, e) {
     }
   }
 }
-function I(r7) {
+function k(r7) {
   return !!(r7 && typeof r7 == "object" && "resourceType" in r7);
 }
-function le(r7) {
+function pe(r7) {
   return !!(r7 && typeof r7 == "object" && "reference" in r7 && typeof r7.reference == "string");
 }
 var L = { types: {} };
-function Ie(r7) {
+function ke(r7) {
   if (r7.startsWith("T")) return r7 + "T00:00:00.000Z".substring(r7.length);
   if (r7.length <= 10) return r7;
   try {
@@ -41095,8 +41100,8 @@ function Ie(r7) {
     return r7;
   }
 }
-var z = () => [];
-var A = { empty: (r7, e) => f(e.length === 0 || e.every((t) => S(t.value))), hasValue: (r7, e) => f(e.length !== 0), exists: (r7, e, t) => t ? f(e.filter((n) => N(t.eval(r7, [n]))).length > 0) : f(e.length > 0 && e.every((n) => !S(n.value))), all: (r7, e, t) => f(e.every((n) => N(t.eval(r7, [n])))), allTrue: (r7, e) => {
+var J = () => [];
+var O = { empty: (r7, e) => f(e.length === 0 || e.every((t) => S(t.value))), hasValue: (r7, e) => f(e.length !== 0), exists: (r7, e, t) => t ? f(e.filter((n) => N(t.eval(r7, [n]))).length > 0) : f(e.length > 0 && e.every((n) => !S(n.value))), all: (r7, e, t) => f(e.every((n) => N(t.eval(r7, [n])))), allTrue: (r7, e) => {
   for (let t of e) if (!t.value) return f(false);
   return f(true);
 }, anyTrue: (r7, e) => {
@@ -41110,16 +41115,16 @@ var A = { empty: (r7, e) => f(e.length === 0 || e.every((t) => S(t.value))), has
   return f(false);
 }, subsetOf: (r7, e, t) => {
   if (e.length === 0) return f(true);
-  let n = t.eval(r7, he(r7));
+  let n = t.eval(r7, ye(r7));
   return n.length === 0 ? f(false) : f(e.every((i) => n.some((o) => o.value === i.value)));
 }, supersetOf: (r7, e, t) => {
-  let n = t.eval(r7, he(r7));
+  let n = t.eval(r7, ye(r7));
   return n.length === 0 ? f(true) : e.length === 0 ? f(false) : f(n.every((i) => e.some((o) => o.value === i.value)));
-}, count: (r7, e) => [{ type: l.integer, value: e.length }], distinct: (r7, e) => {
+}, count: (r7, e) => [{ type: p.integer, value: e.length }], distinct: (r7, e) => {
   let t = [];
   for (let n of e) t.some((i) => i.value === n.value) || t.push(n);
   return t;
-}, isDistinct: (r7, e) => f(e.length === A.distinct(r7, e).length), where: (r7, e, t) => e.filter((n) => N(t.eval(r7, [n]))), select: (r7, e, t) => e.map((n) => t.eval({ parent: r7, variables: { $this: n } }, [n])).flat(), repeat: z, ofType: (r7, e, t) => e.filter((n) => n.type === t.name), single: (r7, e) => {
+}, isDistinct: (r7, e) => f(e.length === O.distinct(r7, e).length), where: (r7, e, t) => e.filter((n) => N(t.eval(r7, [n]))), select: (r7, e, t) => e.map((n) => t.eval({ parent: r7, variables: { $this: n } }, [n])).flat(), repeat: J, ofType: (r7, e, t) => e.filter((n) => n.type === t.name), single: (r7, e) => {
   if (e.length > 1) throw new Error("Expected input length one for single()");
   return e.length === 0 ? [] : e.slice(0, 1);
 }, first: (r7, e) => e.length === 0 ? [] : e.slice(0, 1), last: (r7, e) => e.length === 0 ? [] : e.slice(e.length - 1, e.length), tail: (r7, e) => e.length === 0 ? [] : e.slice(1, e.length), skip: (r7, e, t) => {
@@ -41132,21 +41137,21 @@ var A = { empty: (r7, e) => f(e.length === 0 || e.every((t) => S(t.value))), has
   return n >= e.length ? e : n <= 0 ? [] : e.slice(0, n);
 }, intersect: (r7, e, t) => {
   if (!t) return e;
-  let n = t.eval(r7, he(r7)), i = [];
+  let n = t.eval(r7, ye(r7)), i = [];
   for (let o of e) !i.some((s) => s.value === o.value) && n.some((s) => s.value === o.value) && i.push(o);
   return i;
 }, exclude: (r7, e, t) => {
   if (!t) return e;
-  let n = t.eval(r7, he(r7)), i = [];
+  let n = t.eval(r7, ye(r7)), i = [];
   for (let o of e) n.some((s) => s.value === o.value) || i.push(o);
   return i;
 }, union: (r7, e, t) => {
   if (!t) return e;
-  let n = t.eval(r7, he(r7));
-  return st([...e, ...n]);
+  let n = t.eval(r7, ye(r7));
+  return ot([...e, ...n]);
 }, combine: (r7, e, t) => {
   if (!t) return e;
-  let n = t.eval(r7, he(r7));
+  let n = t.eval(r7, ye(r7));
   return [...e, ...n];
 }, htmlChecks: (r7, e, t) => [g(true)], iif: (r7, e, t, n, i) => {
   let o = t.eval(r7, e);
@@ -41154,8 +41159,8 @@ var A = { empty: (r7, e) => f(e.length === 0 || e.every((t) => S(t.value))), has
   return N(o) ? n.eval(r7, e) : i ? i.eval(r7, e) : [];
 }, toBoolean: (r7, e) => {
   if (e.length === 0) return [];
-  let [{ value: t }] = G(e, 1);
-  if (typeof t == "boolean") return [{ type: l.boolean, value: t }];
+  let [{ value: t }] = Q(e, 1);
+  if (typeof t == "boolean") return [{ type: p.boolean, value: t }];
   if (typeof t == "number" && (t === 0 || t === 1)) return f(!!t);
   if (typeof t == "string") {
     let n = t.toLowerCase();
@@ -41163,58 +41168,58 @@ var A = { empty: (r7, e) => f(e.length === 0 || e.every((t) => S(t.value))), has
     if (["false", "f", "no", "n", "0", "0.0"].includes(n)) return f(false);
   }
   return [];
-}, convertsToBoolean: (r7, e) => e.length === 0 ? [] : f(A.toBoolean(r7, e).length === 1), toInteger: (r7, e) => {
+}, convertsToBoolean: (r7, e) => e.length === 0 ? [] : f(O.toBoolean(r7, e).length === 1), toInteger: (r7, e) => {
   if (e.length === 0) return [];
-  let [{ value: t }] = G(e, 1);
-  return typeof t == "number" ? [{ type: l.integer, value: t }] : typeof t == "string" && /^[+-]?\d+$/.exec(t) ? [{ type: l.integer, value: parseInt(t, 10) }] : typeof t == "boolean" ? [{ type: l.integer, value: t ? 1 : 0 }] : [];
-}, convertsToInteger: (r7, e) => e.length === 0 ? [] : f(A.toInteger(r7, e).length === 1), toDate: (r7, e) => {
+  let [{ value: t }] = Q(e, 1);
+  return typeof t == "number" ? [{ type: p.integer, value: t }] : typeof t == "string" && /^[+-]?\d+$/.exec(t) ? [{ type: p.integer, value: parseInt(t, 10) }] : typeof t == "boolean" ? [{ type: p.integer, value: t ? 1 : 0 }] : [];
+}, convertsToInteger: (r7, e) => e.length === 0 ? [] : f(O.toInteger(r7, e).length === 1), toDate: (r7, e) => {
   if (e.length === 0) return [];
-  let [{ value: t }] = G(e, 1);
-  return typeof t == "string" && /^\d{4}(-\d{2}(-\d{2})?)?/.exec(t) ? [{ type: l.date, value: Ie(t) }] : [];
-}, convertsToDate: (r7, e) => e.length === 0 ? [] : f(A.toDate(r7, e).length === 1), toDateTime: (r7, e) => {
+  let [{ value: t }] = Q(e, 1);
+  return typeof t == "string" && /^\d{4}(-\d{2}(-\d{2})?)?/.exec(t) ? [{ type: p.date, value: ke(t) }] : [];
+}, convertsToDate: (r7, e) => e.length === 0 ? [] : f(O.toDate(r7, e).length === 1), toDateTime: (r7, e) => {
   if (e.length === 0) return [];
-  let [{ value: t }] = G(e, 1);
-  return typeof t == "string" && /^\d{4}(-\d{2}(-\d{2})?)?/.exec(t) ? [{ type: l.dateTime, value: Ie(t) }] : [];
-}, convertsToDateTime: (r7, e) => e.length === 0 ? [] : f(A.toDateTime(r7, e).length === 1), toDecimal: (r7, e) => {
+  let [{ value: t }] = Q(e, 1);
+  return typeof t == "string" && /^\d{4}(-\d{2}(-\d{2})?)?/.exec(t) ? [{ type: p.dateTime, value: ke(t) }] : [];
+}, convertsToDateTime: (r7, e) => e.length === 0 ? [] : f(O.toDateTime(r7, e).length === 1), toDecimal: (r7, e) => {
   if (e.length === 0) return [];
-  let [{ value: t }] = G(e, 1);
-  return typeof t == "number" ? [{ type: l.decimal, value: t }] : typeof t == "string" && /^-?\d{1,9}(\.\d{1,9})?$/.exec(t) ? [{ type: l.decimal, value: parseFloat(t) }] : typeof t == "boolean" ? [{ type: l.decimal, value: t ? 1 : 0 }] : [];
-}, convertsToDecimal: (r7, e) => e.length === 0 ? [] : f(A.toDecimal(r7, e).length === 1), toQuantity: (r7, e) => {
+  let [{ value: t }] = Q(e, 1);
+  return typeof t == "number" ? [{ type: p.decimal, value: t }] : typeof t == "string" && /^-?\d{1,9}(\.\d{1,9})?$/.exec(t) ? [{ type: p.decimal, value: parseFloat(t) }] : typeof t == "boolean" ? [{ type: p.decimal, value: t ? 1 : 0 }] : [];
+}, convertsToDecimal: (r7, e) => e.length === 0 ? [] : f(O.toDecimal(r7, e).length === 1), toQuantity: (r7, e) => {
   if (e.length === 0) return [];
-  let [{ value: t }] = G(e, 1);
-  return k(t) ? [{ type: l.Quantity, value: t }] : typeof t == "number" ? [{ type: l.Quantity, value: { value: t, unit: "1" } }] : typeof t == "string" && /^-?\d{1,9}(\.\d{1,9})?/.exec(t) ? [{ type: l.Quantity, value: { value: parseFloat(t), unit: "1" } }] : typeof t == "boolean" ? [{ type: l.Quantity, value: { value: t ? 1 : 0, unit: "1" } }] : [];
-}, convertsToQuantity: (r7, e) => e.length === 0 ? [] : f(A.toQuantity(r7, e).length === 1), toString: (r7, e) => {
+  let [{ value: t }] = Q(e, 1);
+  return V(t) ? [{ type: p.Quantity, value: t }] : typeof t == "number" ? [{ type: p.Quantity, value: { value: t, unit: "1" } }] : typeof t == "string" && /^-?\d{1,9}(\.\d{1,9})?/.exec(t) ? [{ type: p.Quantity, value: { value: parseFloat(t), unit: "1" } }] : typeof t == "boolean" ? [{ type: p.Quantity, value: { value: t ? 1 : 0, unit: "1" } }] : [];
+}, convertsToQuantity: (r7, e) => e.length === 0 ? [] : f(O.toQuantity(r7, e).length === 1), toString: (r7, e) => {
   if (e.length === 0) return [];
-  let [{ value: t }] = G(e, 1);
-  return t == null ? [] : k(t) ? [{ type: l.string, value: `${t.value} '${t.unit}'` }] : [{ type: l.string, value: t.toString() }];
-}, convertsToString: (r7, e) => e.length === 0 ? [] : f(A.toString(r7, e).length === 1), toTime: (r7, e) => {
+  let [{ value: t }] = Q(e, 1);
+  return t == null ? [] : V(t) ? [{ type: p.string, value: `${t.value} '${t.unit}'` }] : [{ type: p.string, value: t.toString() }];
+}, convertsToString: (r7, e) => e.length === 0 ? [] : f(O.toString(r7, e).length === 1), toTime: (r7, e) => {
   if (e.length === 0) return [];
-  let [{ value: t }] = G(e, 1);
+  let [{ value: t }] = Q(e, 1);
   if (typeof t == "string") {
     let n = /^T?(\d{2}(:\d{2}(:\d{2})?)?)/.exec(t);
-    if (n) return [{ type: l.time, value: Ie("T" + n[1]) }];
+    if (n) return [{ type: p.time, value: ke("T" + n[1]) }];
   }
   return [];
-}, convertsToTime: (r7, e) => e.length === 0 ? [] : f(A.toTime(r7, e).length === 1), indexOf: (r7, e, t) => F((n, i) => n.indexOf(i), r7, e, t), substring: (r7, e, t, n) => F((i, o, s) => {
+}, convertsToTime: (r7, e) => e.length === 0 ? [] : f(O.toTime(r7, e).length === 1), indexOf: (r7, e, t) => F((n, i) => n.indexOf(i), r7, e, t), substring: (r7, e, t, n) => F((i, o, s) => {
   let a2 = o, c = s ? a2 + s : i.length;
   return a2 < 0 || a2 >= i.length ? void 0 : i.substring(a2, c);
-}, r7, e, t, n), startsWith: (r7, e, t) => F((n, i) => n.startsWith(i), r7, e, t), endsWith: (r7, e, t) => F((n, i) => n.endsWith(i), r7, e, t), contains: (r7, e, t) => F((n, i) => n.includes(i), r7, e, t), upper: (r7, e) => F((t) => t.toUpperCase(), r7, e), lower: (r7, e) => F((t) => t.toLowerCase(), r7, e), replace: (r7, e, t, n) => F((i, o, s) => i.replaceAll(o, s), r7, e, t, n), matches: (r7, e, t) => F((n, i) => !!new RegExp(i).exec(n), r7, e, t), replaceMatches: (r7, e, t, n) => F((i, o, s) => i.replaceAll(o, s), r7, e, t, n), length: (r7, e) => F((t) => t.length, r7, e), toChars: (r7, e) => F((t) => t ? t.split("") : void 0, r7, e), encode: z, decode: z, escape: z, unescape: z, trim: z, split: z, join: (r7, e, t) => {
-  let n = t?.eval(r7, he(r7))[0]?.value ?? "";
+}, r7, e, t, n), startsWith: (r7, e, t) => F((n, i) => n.startsWith(i), r7, e, t), endsWith: (r7, e, t) => F((n, i) => n.endsWith(i), r7, e, t), contains: (r7, e, t) => F((n, i) => n.includes(i), r7, e, t), upper: (r7, e) => F((t) => t.toUpperCase(), r7, e), lower: (r7, e) => F((t) => t.toLowerCase(), r7, e), replace: (r7, e, t, n) => F((i, o, s) => i.replaceAll(o, s), r7, e, t, n), matches: (r7, e, t) => F((n, i) => !!new RegExp(i).exec(n), r7, e, t), replaceMatches: (r7, e, t, n) => F((i, o, s) => i.replaceAll(o, s), r7, e, t, n), length: (r7, e) => F((t) => t.length, r7, e), toChars: (r7, e) => F((t) => t ? t.split("") : void 0, r7, e), encode: J, decode: J, escape: J, unescape: J, trim: J, split: J, join: (r7, e, t) => {
+  let n = t?.eval(r7, ye(r7))[0]?.value ?? "";
   if (typeof n != "string") throw new Error("Separator must be a string.");
-  return [{ type: l.string, value: e.map((i) => i.value?.toString() ?? "").join(n) }];
-}, abs: (r7, e) => $(Math.abs, r7, e), ceiling: (r7, e) => $(Math.ceil, r7, e), exp: (r7, e) => $(Math.exp, r7, e), floor: (r7, e) => $(Math.floor, r7, e), ln: (r7, e) => $(Math.log, r7, e), log: (r7, e, t) => $((n, i) => Math.log(n) / Math.log(i), r7, e, t), power: (r7, e, t) => $(Math.pow, r7, e, t), round: (r7, e) => $(Math.round, r7, e), sqrt: (r7, e) => $(Math.sqrt, r7, e), truncate: (r7, e) => $((t) => t | 0, r7, e), children: z, descendants: z, trace: (r7, e, t) => e, now: () => [{ type: l.dateTime, value: (/* @__PURE__ */ new Date()).toISOString() }], timeOfDay: () => [{ type: l.time, value: (/* @__PURE__ */ new Date()).toISOString().substring(11) }], today: () => [{ type: l.date, value: (/* @__PURE__ */ new Date()).toISOString().substring(0, 10) }], between: (r7, e, t, n, i) => {
-  let o = A.toDateTime(r7, t.eval(r7, e));
+  return [{ type: p.string, value: e.map((i) => i.value?.toString() ?? "").join(n) }];
+}, abs: (r7, e) => H(Math.abs, r7, e), ceiling: (r7, e) => H(Math.ceil, r7, e), exp: (r7, e) => H(Math.exp, r7, e), floor: (r7, e) => H(Math.floor, r7, e), ln: (r7, e) => H(Math.log, r7, e), log: (r7, e, t) => H((n, i) => Math.log(n) / Math.log(i), r7, e, t), power: (r7, e, t) => H(Math.pow, r7, e, t), round: (r7, e) => H(Math.round, r7, e), sqrt: (r7, e) => H(Math.sqrt, r7, e), truncate: (r7, e) => H((t) => t | 0, r7, e), children: J, descendants: J, trace: (r7, e, t) => e, now: () => [{ type: p.dateTime, value: (/* @__PURE__ */ new Date()).toISOString() }], timeOfDay: () => [{ type: p.time, value: (/* @__PURE__ */ new Date()).toISOString().substring(11) }], today: () => [{ type: p.date, value: (/* @__PURE__ */ new Date()).toISOString().substring(0, 10) }], between: (r7, e, t, n, i) => {
+  let o = O.toDateTime(r7, t.eval(r7, e));
   if (o.length === 0) throw new Error("Invalid start date");
-  let s = A.toDateTime(r7, n.eval(r7, e));
+  let s = O.toDateTime(r7, n.eval(r7, e));
   if (s.length === 0) throw new Error("Invalid end date");
   let a2 = i.eval(r7, e)[0]?.value;
   if (a2 !== "years" && a2 !== "months" && a2 !== "days") throw new Error("Invalid units");
-  let c = ut(o[0].value, s[0].value);
-  return [{ type: l.Quantity, value: { value: c[a2], unit: a2 } }];
+  let c = ct(o[0].value, s[0].value);
+  return [{ type: p.Quantity, value: { value: c[a2], unit: a2 } }];
 }, is: (r7, e, t) => {
   let n = "";
-  return t instanceof q ? n = t.name : t instanceof ne && (n = t.left.name + "." + t.right.name), n ? e.map((i) => ({ type: l.boolean, value: at(i, n) })) : [];
-}, not: (r7, e) => A.toBoolean(r7, e).map((t) => ({ type: l.boolean, value: !t.value })), resolve: (r7, e) => e.map((t) => {
+  return t instanceof j ? n = t.name : t instanceof ie && (n = t.left.name + "." + t.right.name), n ? e.map((i) => ({ type: p.boolean, value: st(i, n) })) : [];
+}, not: (r7, e) => O.toBoolean(r7, e).map((t) => ({ type: p.boolean, value: !t.value })), resolve: (r7, e) => e.map((t) => {
   let n = t.value, i;
   if (typeof n == "string") i = n;
   else if (typeof n == "object") {
@@ -41230,48 +41235,48 @@ var A = { empty: (r7, e) => f(e.length === 0 || e.every((t) => S(t.value))), has
     let [o, s] = i.split("/");
     return { type: o, value: { resourceType: o, id: s } };
   }
-  return { type: l.BackboneElement, value: void 0 };
-}).filter((t) => !!t.value), as: (r7, e) => e, type: (r7, e) => e.map(({ value: t }) => typeof t == "boolean" ? { type: l.BackboneElement, value: { namespace: "System", name: "Boolean" } } : typeof t == "number" ? { type: l.BackboneElement, value: { namespace: "System", name: "Integer" } } : I(t) ? { type: l.BackboneElement, value: { namespace: "FHIR", name: t.resourceType } } : { type: l.BackboneElement, value: null }), conformsTo: (r7, e, t) => {
+  return { type: p.BackboneElement, value: void 0 };
+}).filter((t) => !!t.value), as: (r7, e) => e, type: (r7, e) => e.map(({ value: t }) => typeof t == "boolean" ? { type: p.BackboneElement, value: { namespace: "System", name: "Boolean" } } : typeof t == "number" ? { type: p.BackboneElement, value: { namespace: "System", name: "Integer" } } : k(t) ? { type: p.BackboneElement, value: { namespace: "FHIR", name: t.resourceType } } : { type: p.BackboneElement, value: null }), conformsTo: (r7, e, t) => {
   let n = t.eval(r7, e)[0].value;
   if (!n.startsWith("http://hl7.org/fhir/StructureDefinition/")) throw new Error("Expected a StructureDefinition URL");
   let i = n.replace("http://hl7.org/fhir/StructureDefinition/", "");
-  return e.map((o) => ({ type: l.boolean, value: o.value?.resourceType === i }));
+  return e.map((o) => ({ type: p.boolean, value: o.value?.resourceType === i }));
 }, getResourceKey: (r7, e) => {
   let t = e[0].value;
-  return t?.id ? [{ type: l.id, value: t.id }] : [];
+  return t?.id ? [{ type: p.id, value: t.id }] : [];
 }, getReferenceKey: (r7, e, t) => {
   let n = e[0].value;
   if (!n?.reference) return [];
   let i = "";
-  return t instanceof q && (i = t.name), i && !n.reference.startsWith(i + "/") ? [] : [{ type: l.id, value: de(n) }];
+  return t instanceof j && (i = t.name), i && !n.reference.startsWith(i + "/") ? [] : [{ type: p.id, value: fe(n) }];
 }, extension: (r7, e, t) => {
   let n = t.eval(r7, e)[0].value, i = e?.[0]?.value;
   if (i) {
-    let o = X(i, n);
-    if (o) return [{ type: l.Extension, value: o }];
+    let o = ee(i, n);
+    if (o) return [{ type: p.Extension, value: o }];
   }
   return [];
 } };
 function F(r7, e, t, ...n) {
   if (t.length === 0) return [];
-  let [{ value: i }] = G(t, 1);
+  let [{ value: i }] = Q(t, 1);
   if (typeof i != "string") throw new Error("String function cannot be called with non-string");
   let o = r7(i, ...n.map((s) => s?.eval(e, t)[0]?.value));
   return o === void 0 ? [] : Array.isArray(o) ? o.map(g) : [g(o)];
 }
-function $(r7, e, t, ...n) {
+function H(r7, e, t, ...n) {
   if (t.length === 0) return [];
-  let [{ value: i }] = G(t, 1), o = k(i), s = o ? i.value : i;
+  let [{ value: i }] = Q(t, 1), o = V(i), s = o ? i.value : i;
   if (typeof s != "number") throw new Error("Math function cannot be called with non-number");
-  let a2 = r7(s, ...n.map((p2) => p2.eval(e, t)[0]?.value)), c = o ? l.Quantity : t[0].type, u2 = o ? { ...i, value: a2 } : a2;
+  let a2 = r7(s, ...n.map((l2) => l2.eval(e, t)[0]?.value)), c = o ? p.Quantity : t[0].type, u2 = o ? { ...i, value: a2 } : a2;
   return [{ type: c, value: u2 }];
 }
-function G(r7, e) {
+function Q(r7, e) {
   if (r7.length !== e) throw new Error(`Expected ${e} arguments`);
   for (let t of r7) if (t == null) throw new Error("Expected non-null argument");
   return r7;
 }
-function he(r7) {
+function ye(r7) {
   let e = r7;
   for (; e.parent?.variables.$this; ) e = e.parent;
   return [e.variables.$this];
@@ -41288,7 +41293,7 @@ var U = class {
     return typeof e == "string" ? `'${e}'` : e.toString();
   }
 };
-var q = class {
+var j = class {
   constructor(e) {
     this.name = e;
   }
@@ -41306,13 +41311,13 @@ var q = class {
   }
   evalValue(e) {
     let t = e.value;
-    if (!(!t || typeof t != "object")) return I(t) && t.resourceType === this.name ? e : P(e, this.name);
+    if (!(!t || typeof t != "object")) return k(t) && t.resourceType === this.name ? e : P(e, this.name);
   }
   toString() {
     return this.name;
   }
 };
-var ft = class {
+var dt = class {
   eval() {
     return [];
   }
@@ -41320,7 +41325,7 @@ var ft = class {
     return "{}";
   }
 };
-var mt = class extends Ye {
+var ft = class extends Je {
   constructor(t, n, i) {
     super(t, n);
     this.impl = i;
@@ -41332,17 +41337,17 @@ var mt = class extends Ye {
     return this.operator + this.child.toString();
   }
 };
-var ye = class extends Y {
+var ge = class extends Z {
   constructor(e, t) {
     super("as", e, t);
   }
   eval(e, t) {
-    return A.ofType(e, this.left.eval(e, t), this.right);
+    return O.ofType(e, this.left.eval(e, t), this.right);
   }
 };
-var C = class extends Y {
+var C = class extends Z {
 };
-var V = class extends C {
+var D = class extends C {
   constructor(t, n, i, o) {
     super(t, n, i);
     this.impl = o;
@@ -41352,20 +41357,20 @@ var V = class extends C {
     if (i.length !== 1) return [];
     let o = this.right.eval(t, n);
     if (o.length !== 1) return [];
-    let s = i[0].value, a2 = o[0].value, c = k(s) ? s.value : s, u2 = k(a2) ? a2.value : a2, p2 = this.impl(c, u2);
-    return typeof p2 == "boolean" ? f(p2) : k(s) ? [{ type: l.Quantity, value: { ...s, value: p2 } }] : [g(p2)];
+    let s = i[0].value, a2 = o[0].value, c = V(s) ? s.value : s, u2 = V(a2) ? a2.value : a2, l2 = this.impl(c, u2);
+    return typeof l2 == "boolean" ? f(l2) : V(s) ? [{ type: p.Quantity, value: { ...s, value: l2 } }] : [g(l2)];
   }
 };
-var ht = class extends Y {
+var mt = class extends Z {
   constructor(e, t) {
     super("&", e, t);
   }
   eval(e, t) {
     let n = this.left.eval(e, t), i = this.right.eval(e, t), o = [...n, ...i];
-    return o.length > 0 && o.every((s) => typeof s.value == "string") ? [{ type: l.string, value: o.map((s) => s.value).join("") }] : o;
+    return o.length > 0 && o.every((s) => typeof s.value == "string") ? [{ type: p.string, value: o.map((s) => s.value).join("") }] : o;
   }
 };
-var yt = class extends C {
+var ht = class extends C {
   constructor(e, t) {
     super("contains", e, t);
   }
@@ -41374,16 +41379,16 @@ var yt = class extends C {
     return f(n.some((o) => o.value === i[0].value));
   }
 };
-var gt = class extends C {
+var yt = class extends C {
   constructor(e, t) {
     super("in", e, t);
   }
   eval(e, t) {
-    let n = W(this.left.eval(e, t)), i = this.right.eval(e, t);
+    let n = $(this.left.eval(e, t)), i = this.right.eval(e, t);
     return n ? f(i.some((o) => o.value === n.value)) : [];
   }
 };
-var ne = class extends Y {
+var ie = class extends Z {
   constructor(e, t) {
     super(".", e, t);
   }
@@ -41394,34 +41399,34 @@ var ne = class extends Y {
     return `${this.left.toString()}.${this.right.toString()}`;
   }
 };
-var ke = class extends Y {
+var Ve = class extends Z {
   constructor(e, t) {
     super("|", e, t);
   }
   eval(e, t) {
     let n = this.left.eval(e, t), i = this.right.eval(e, t);
-    return st([...n, ...i]);
+    return ot([...n, ...i]);
   }
 };
-var xt = class extends C {
+var gt = class extends C {
   constructor(e, t) {
     super("=", e, t);
   }
   eval(e, t) {
     let n = this.left.eval(e, t), i = this.right.eval(e, t);
-    return Dn(n, i);
+    return Mn(n, i);
   }
 };
-var vt = class extends C {
+var xt = class extends C {
   constructor(e, t) {
     super("!=", e, t);
   }
   eval(e, t) {
     let n = this.left.eval(e, t), i = this.right.eval(e, t);
-    return Mn(n, i);
+    return _n(n, i);
   }
 };
-var Tt = class extends C {
+var vt = class extends C {
   constructor(e, t) {
     super("~", e, t);
   }
@@ -41430,16 +41435,16 @@ var Tt = class extends C {
     return xr(n, i);
   }
 };
-var St = class extends C {
+var Tt = class extends C {
   constructor(e, t) {
     super("!~", e, t);
   }
   eval(e, t) {
     let n = this.left.eval(e, t), i = this.right.eval(e, t);
-    return Vn(xr(n, i));
+    return Dn(xr(n, i));
   }
 };
-var ge = class extends C {
+var xe = class extends C {
   constructor(e, t) {
     super("is", e, t);
   }
@@ -41447,52 +41452,52 @@ var ge = class extends C {
     let n = this.left.eval(e, t);
     if (n.length !== 1) return [];
     let i = this.right.name;
-    return f(at(n[0], i));
+    return f(st(n[0], i));
   }
 };
-var Et = class extends C {
+var St = class extends C {
   constructor(e, t) {
     super("and", e, t);
   }
   eval(e, t) {
-    let n = W(this.left.eval(e, t), "boolean"), i = W(this.right.eval(e, t), "boolean");
+    let n = $(this.left.eval(e, t), "boolean"), i = $(this.right.eval(e, t), "boolean");
     return n?.value === true && i?.value === true ? f(true) : n?.value === false || i?.value === false ? f(false) : [];
   }
 };
-var bt = class extends C {
+var Et = class extends C {
   constructor(e, t) {
     super("or", e, t);
   }
   eval(e, t) {
-    let n = W(this.left.eval(e, t), "boolean"), i = W(this.right.eval(e, t), "boolean");
+    let n = $(this.left.eval(e, t), "boolean"), i = $(this.right.eval(e, t), "boolean");
     return n?.value === false && i?.value === false ? f(false) : n?.value || i?.value ? f(true) : [];
   }
 };
-var Rt = class extends C {
+var bt = class extends C {
   constructor(e, t) {
     super("xor", e, t);
   }
   eval(e, t) {
-    let n = W(this.left.eval(e, t), "boolean"), i = W(this.right.eval(e, t), "boolean");
+    let n = $(this.left.eval(e, t), "boolean"), i = $(this.right.eval(e, t), "boolean");
     return !n || !i ? [] : f(n.value !== i.value);
   }
 };
-var Ct = class extends C {
+var Rt = class extends C {
   constructor(e, t) {
     super("implies", e, t);
   }
   eval(e, t) {
-    let n = W(this.left.eval(e, t), "boolean"), i = W(this.right.eval(e, t), "boolean");
+    let n = $(this.left.eval(e, t), "boolean"), i = $(this.right.eval(e, t), "boolean");
     return i?.value === true || n?.value === false ? f(true) : !n || !i ? [] : f(false);
   }
 };
-var J = class {
+var Y = class {
   constructor(e, t) {
     this.name = e;
     this.args = t;
   }
   eval(e, t) {
-    let n = A[this.name];
+    let n = O[this.name];
     if (!n) throw new Error("Unrecognized function: " + this.name);
     return n(e, t, ...this.args);
   }
@@ -41500,7 +41505,7 @@ var J = class {
     return `${this.name}(${this.args.map((e) => e.toString()).join(", ")})`;
   }
 };
-var xe = class {
+var ve = class {
   constructor(e, t) {
     this.left = e;
     this.expr = t;
@@ -41517,7 +41522,7 @@ var xe = class {
     return `${this.left.toString()}[${this.expr.toString()}]`;
   }
 };
-var je = ["!=", "!~", "<=", ">=", "{}", "->"];
+var We = ["!=", "!~", "<=", ">=", "{}", "->"];
 var y = { 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 as = { parse(r7) {
   let e = r7.consumeAndParse();
@@ -41527,25 +41532,25 @@ var as = { parse(r7) {
 var cs = { parse(r7, e) {
   let t = r7.consumeAndParse();
   if (!r7.match("]")) throw new Error("Parse error: expected `]`");
-  return new xe(e, t);
+  return new ve(e, t);
 }, precedence: y.Indexer };
 var us = { parse(r7, e) {
-  if (!(e instanceof q)) throw new Error("Unexpected parentheses");
+  if (!(e instanceof j)) throw new Error("Unexpected parentheses");
   let t = [];
   for (; !r7.match(")"); ) t.push(r7.consumeAndParse()), r7.match(",");
-  return new J(e.name, t);
+  return new Y(e.name, t);
 }, precedence: y.FunctionCall };
 function ls(r7) {
   let e = r7.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 $e() {
-  return new Ze().registerPrefix("String", { parse: (r7, e) => new U({ type: l.string, value: e.value }) }).registerPrefix("DateTime", { parse: (r7, e) => new U({ type: l.dateTime, value: Ie(e.value) }) }).registerPrefix("Quantity", { parse: (r7, e) => new U({ type: l.Quantity, value: ls(e.value) }) }).registerPrefix("Number", { parse: (r7, e) => new U({ type: e.value.includes(".") ? l.decimal : l.integer, value: parseFloat(e.value) }) }).registerPrefix("true", { parse: () => new U({ type: l.boolean, value: true }) }).registerPrefix("false", { parse: () => new U({ type: l.boolean, value: false }) }).registerPrefix("Symbol", { parse: (r7, e) => new q(e.value) }).registerPrefix("{}", { parse: () => new ft() }).registerPrefix("(", as).registerInfix("[", cs).registerInfix("(", us).prefix("+", y.UnaryAdd, (r7, e) => new mt("+", e, (t) => t)).prefix("-", y.UnarySubtract, (r7, e) => new V("-", e, e, (t, n) => -n)).infixLeft(".", y.Dot, (r7, e, t) => new ne(r7, t)).infixLeft("/", y.Divide, (r7, e, t) => new V("/", r7, t, (n, i) => n / i)).infixLeft("*", y.Multiply, (r7, e, t) => new V("*", r7, t, (n, i) => n * i)).infixLeft("+", y.Add, (r7, e, t) => new V("+", r7, t, (n, i) => n + i)).infixLeft("-", y.Subtract, (r7, e, t) => new V("-", r7, t, (n, i) => n - i)).infixLeft("|", y.Union, (r7, e, t) => new ke(r7, t)).infixLeft("=", y.Equals, (r7, e, t) => new xt(r7, t)).infixLeft("!=", y.NotEquals, (r7, e, t) => new vt(r7, t)).infixLeft("~", y.Equivalent, (r7, e, t) => new Tt(r7, t)).infixLeft("!~", y.NotEquivalent, (r7, e, t) => new St(r7, t)).infixLeft("<", y.LessThan, (r7, e, t) => new V("<", r7, t, (n, i) => n < i)).infixLeft("<=", y.LessThanOrEquals, (r7, e, t) => new V("<=", r7, t, (n, i) => n <= i)).infixLeft(">", y.GreaterThan, (r7, e, t) => new V(">", r7, t, (n, i) => n > i)).infixLeft(">=", y.GreaterThanOrEquals, (r7, e, t) => new V(">=", r7, t, (n, i) => n >= i)).infixLeft("&", y.Ampersand, (r7, e, t) => new ht(r7, t)).infixLeft("and", y.And, (r7, e, t) => new Et(r7, t)).infixLeft("as", y.As, (r7, e, t) => new ye(r7, t)).infixLeft("contains", y.Contains, (r7, e, t) => new yt(r7, t)).infixLeft("div", y.Divide, (r7, e, t) => new V("div", r7, t, (n, i) => n / i | 0)).infixLeft("in", y.In, (r7, e, t) => new gt(r7, t)).infixLeft("is", y.Is, (r7, e, t) => new ge(r7, t)).infixLeft("mod", y.Modulo, (r7, e, t) => new V("mod", r7, t, (n, i) => n % i)).infixLeft("or", y.Or, (r7, e, t) => new bt(r7, t)).infixLeft("xor", y.Xor, (r7, e, t) => new Rt(r7, t)).infixLeft("implies", y.Implies, (r7, e, t) => new Ct(r7, t));
+  return new Ye().registerPrefix("String", { parse: (r7, e) => new U({ type: p.string, value: e.value }) }).registerPrefix("DateTime", { parse: (r7, e) => new U({ type: p.dateTime, value: ke(e.value) }) }).registerPrefix("Quantity", { parse: (r7, e) => new U({ type: p.Quantity, value: ls(e.value) }) }).registerPrefix("Number", { parse: (r7, e) => new U({ type: e.value.includes(".") ? p.decimal : p.integer, value: parseFloat(e.value) }) }).registerPrefix("true", { parse: () => new U({ type: p.boolean, value: true }) }).registerPrefix("false", { parse: () => new U({ type: p.boolean, value: false }) }).registerPrefix("Symbol", { parse: (r7, e) => new j(e.value) }).registerPrefix("{}", { parse: () => new dt() }).registerPrefix("(", as).registerInfix("[", cs).registerInfix("(", us).prefix("+", y.UnaryAdd, (r7, e) => new ft("+", e, (t) => t)).prefix("-", y.UnarySubtract, (r7, e) => new D("-", e, e, (t, n) => -n)).infixLeft(".", y.Dot, (r7, e, t) => new ie(r7, t)).infixLeft("/", y.Divide, (r7, e, t) => new D("/", r7, t, (n, i) => n / i)).infixLeft("*", y.Multiply, (r7, e, t) => new D("*", r7, t, (n, i) => n * i)).infixLeft("+", y.Add, (r7, e, t) => new D("+", r7, t, (n, i) => n + i)).infixLeft("-", y.Subtract, (r7, e, t) => new D("-", r7, t, (n, i) => n - i)).infixLeft("|", y.Union, (r7, e, t) => new Ve(r7, t)).infixLeft("=", y.Equals, (r7, e, t) => new gt(r7, t)).infixLeft("!=", y.NotEquals, (r7, e, t) => new xt(r7, t)).infixLeft("~", y.Equivalent, (r7, e, t) => new vt(r7, t)).infixLeft("!~", y.NotEquivalent, (r7, e, t) => new Tt(r7, t)).infixLeft("<", y.LessThan, (r7, e, t) => new D("<", r7, t, (n, i) => n < i)).infixLeft("<=", y.LessThanOrEquals, (r7, e, t) => new D("<=", r7, t, (n, i) => n <= i)).infixLeft(">", y.GreaterThan, (r7, e, t) => new D(">", r7, t, (n, i) => n > i)).infixLeft(">=", y.GreaterThanOrEquals, (r7, e, t) => new D(">=", r7, t, (n, i) => n >= i)).infixLeft("&", y.Ampersand, (r7, e, t) => new mt(r7, t)).infixLeft("and", y.And, (r7, e, t) => new St(r7, t)).infixLeft("as", y.As, (r7, e, t) => new ge(r7, t)).infixLeft("contains", y.Contains, (r7, e, t) => new ht(r7, t)).infixLeft("div", y.Divide, (r7, e, t) => new D("div", r7, t, (n, i) => n / i | 0)).infixLeft("in", y.In, (r7, e, t) => new yt(r7, t)).infixLeft("is", y.Is, (r7, e, t) => new xe(r7, t)).infixLeft("mod", y.Modulo, (r7, e, t) => new D("mod", r7, t, (n, i) => n % i)).infixLeft("or", y.Or, (r7, e, t) => new Et(r7, t)).infixLeft("xor", y.Xor, (r7, e, t) => new bt(r7, t)).infixLeft("implies", y.Implies, (r7, e, t) => new Rt(r7, t));
 }
 var ps = $e();
-var ii = ((p2) => (p2.BOOLEAN = "BOOLEAN", p2.NUMBER = "NUMBER", p2.QUANTITY = "QUANTITY", p2.TEXT = "TEXT", p2.REFERENCE = "REFERENCE", p2.CANONICAL = "CANONICAL", p2.DATE = "DATE", p2.DATETIME = "DATETIME", p2.PERIOD = "PERIOD", p2.UUID = "UUID", p2))(ii || {});
+var ii = ((l2) => (l2.BOOLEAN = "BOOLEAN", l2.NUMBER = "NUMBER", l2.QUANTITY = "QUANTITY", l2.TEXT = "TEXT", l2.REFERENCE = "REFERENCE", l2.CANONICAL = "CANONICAL", l2.DATE = "DATE", l2.DATETIME = "DATETIME", l2.PERIOD = "PERIOD", l2.UUID = "UUID", l2))(ii || {});
 var li = ((v) => (v.EQUALS = "eq", v.NOT_EQUALS = "ne", v.GREATER_THAN = "gt", v.LESS_THAN = "lt", v.GREATER_THAN_OR_EQUALS = "ge", v.LESS_THAN_OR_EQUALS = "le", v.STARTS_AFTER = "sa", v.ENDS_BEFORE = "eb", v.APPROXIMATELY = "ap", v.CONTAINS = "contains", v.STARTS_WITH = "sw", v.EXACT = "exact", v.TEXT = "text", v.NOT = "not", v.ABOVE = "above", v.BELOW = "below", v.IN = "in", v.NOT_IN = "not-in", v.OF_TYPE = "of-type", v.MISSING = "missing", v.PRESENT = "present", v.IDENTIFIER = "identifier", v.ITERATE = "iterate", v))(li || {});
-var Us = ((b2) => (b2.READ = "read", b2.VREAD = "vread", b2.UPDATE = "update", b2.PATCH = "patch", b2.DELETE = "delete", b2.HISTORY = "history", b2.HISTORY_INSTANCE = "history-instance", b2.HISTORY_TYPE = "history-type", b2.HISTORY_SYSTEM = "history-system", b2.CREATE = "create", b2.SEARCH = "search", b2.SEARCH_TYPE = "search-type", b2.SEARCH_SYSTEM = "search-system", b2.SEARCH_COMPARTMENT = "search-compartment", b2.CAPABILITIES = "capabilities", b2.TRANSACTION = "transaction", b2.BATCH = "batch", b2.OPERATION = "operation", b2))(Us || {});
+var Bs = ((b2) => (b2.READ = "read", b2.VREAD = "vread", b2.UPDATE = "update", b2.PATCH = "patch", b2.DELETE = "delete", b2.HISTORY = "history", b2.HISTORY_INSTANCE = "history-instance", b2.HISTORY_TYPE = "history-type", b2.HISTORY_SYSTEM = "history-system", b2.CREATE = "create", b2.SEARCH = "search", b2.SEARCH_TYPE = "search-type", b2.SEARCH_SYSTEM = "search-system", b2.SEARCH_COMPARTMENT = "search-compartment", b2.CAPABILITIES = "capabilities", b2.TRANSACTION = "transaction", b2.BATCH = "batch", b2.OPERATION = "operation", b2))(Bs || {});
 function mi(r7) {
   if (typeof window < "u") {
     let e = window.atob(r7), t = Uint8Array.from(e, (n) => n.charCodeAt(0));
@@ -41564,12 +41569,12 @@ function hi(r7) {
 }
 function Nr() {
   let r7 = new Uint32Array(28);
-  return crypto.getRandomValues(r7), jn(r7.buffer);
+  return crypto.getRandomValues(r7), $n(r7.buffer);
 }
 async function yi(r7) {
   return crypto.subtle.digest("SHA-256", new TextEncoder().encode(r7));
 }
-function ve() {
+function Te() {
   return "xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx".replace(/[xy]/g, (r7) => {
     let e = Math.random() * 16 | 0;
     return (r7 === "x" ? e : e & 3 | 8).toString(16);
@@ -41599,7 +41604,7 @@ var Ot = class {
     return this.cache.keys().next().value;
   }
 };
-var D = { 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", SCIM_JSON: "application/scim+json", SVG: "image/svg+xml", TEXT: "text/plain", TYPESCRIPT: "text/typescript", PING: "x-application/ping" };
+var A = { 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", SCIM_JSON: "application/scim+json", SVG: "image/svg+xml", TEXT: "text/plain", TYPESCRIPT: "text/typescript", PING: "x-application/ping", XML: "text/xml", CDA_XML: "application/cda+xml" };
 var Lr = class {
   constructor() {
     this.listeners = {};
@@ -41625,7 +41630,7 @@ var Lr = class {
     this.listeners = {};
   }
 };
-var H = class {
+var K = class {
   constructor() {
     this.emitter = new Lr();
   }
@@ -41643,7 +41648,7 @@ var H = class {
   }
 };
 var Fr = { "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 Ks = ["Patient", "Encounter", "ImagingStudy", "DiagnosticReport", "OperationOutcome", "Bundle"];
+var zs = ["Patient", "Encounter", "ImagingStudy", "DiagnosticReport", "OperationOutcome", "Bundle"];
 var Ur = ["DiagnosticReport-update"];
 function vi(r7) {
   return Ur.includes(r7);
@@ -41651,9 +41656,9 @@ function vi(r7) {
 function Ti(r7) {
   if (Ur.includes(r7)) throw new d(h(`'context.version' is required for '${r7}'.`));
 }
-var zs = { "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 Js(r7) {
-  return Ks.includes(r7);
+var Js = { "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 Ys(r7) {
+  return zs.includes(r7);
 }
 function Si(r7) {
   return !!r7.endpoint;
@@ -41676,11 +41681,11 @@ function xi(r7, e, t, n) {
   if (!e.resourceType) throw new d(h(`context[${t}] is invalid. Resource must contain a resource type. No resource type found.`));
   let i = n.resourceType;
   if (i !== "*") {
-    if (!Js(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 (!Ys(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 (i && e.resourceType !== i) throw new d(h(`context[${t}] is invalid. context[${t}] for the '${r7}' event should contain resource of type ${i}.`));
   }
 }
-function Ys(r7, e, t, n, i) {
+function Zs(r7, e, t, n, i) {
   if (i.set(e.key, (i.get(e.key) ?? 0) + 1), !n.isArray) xi(r7, e.resource, t, n);
   else {
     let { resources: o } = e;
@@ -41688,12 +41693,12 @@ function Ys(r7, e, t, n, i) {
     for (let s of o) xi(r7, s, t, n);
   }
 }
-function Zs(r7, e) {
-  let t = /* @__PURE__ */ new Map(), n = zs[r7];
+function Xs(r7, e) {
+  let t = /* @__PURE__ */ new Map(), n = Js[r7];
   for (let i = 0; i < e.length; i++) {
     let o = e[i].key;
     if (!n[o]) throw new d(h(`Key '${o}' not found for event '${r7}'. Make sure to add only valid keys.`));
-    Ys(r7, e[i], i, n[o], t);
+    Zs(r7, e[i], i, n[o], t);
   }
   for (let [i, o] of Object.entries(n)) {
     if (!(o.optional || t.has(i))) throw new d(h(`Missing required key '${i}' on context for '${r7}' event.`));
@@ -41706,9 +41711,9 @@ function qr(r7, e, t, n) {
   if (typeof t != "object") throw new d(h("context must be a context object or array of context objects."));
   if (Ur.includes(e) && !n) throw new d(h(`The '${e}' event must contain a 'context.versionId'.`));
   let i = Array.isArray(t) ? t : [t];
-  return Zs(e, i), { timestamp: (/* @__PURE__ */ new Date()).toISOString(), id: ve(), event: { "hub.topic": r7, "hub.event": e, context: i, ...n ? { "context.versionId": n } : {} } };
+  return Xs(e, i), { timestamp: (/* @__PURE__ */ new Date()).toISOString(), id: Te(), event: { "hub.topic": r7, "hub.event": e, context: i, ...n ? { "context.versionId": n } : {} } };
 }
-var It = class extends H {
+var It = class extends K {
   constructor(e) {
     if (super(), this.subRequest = e, !e.endpoint) throw new d(h("Subscription request should contain an endpoint."));
     if (!kt(e)) throw new d(h("Subscription request failed validation."));
@@ -41728,7 +41733,7 @@ var It = class extends H {
     this.websocket.close();
   }
 };
-function Xs(r7) {
+function ea(r7) {
   let e = r7.replace(/-/g, "+").replace(/_/g, "/"), t = mi(e), n = Array.from(t).reduce((o, s) => {
     let a2 = ("00" + s.charCodeAt(0).toString(16)).slice(-2);
     return `${o}%${a2}`;
@@ -41740,7 +41745,7 @@ function Ei(r7) {
 }
 function Vt(r7) {
   let [e, t, n] = r7.split(".");
-  return Xs(t);
+  return ea(t);
 }
 function bi(r7) {
   try {
@@ -41765,7 +41770,7 @@ var Dt = class {
     return this.medplum.get(`keyvalue/v1/${e}`);
   }
   async set(e, t) {
-    await this.medplum.put(`keyvalue/v1/${e}`, t, D.TEXT);
+    await this.medplum.put(`keyvalue/v1/${e}`, t, A.TEXT);
   }
   async delete(e) {
     await this.medplum.delete(`keyvalue/v1/${e}`);
@@ -41807,9 +41812,9 @@ var M = class {
     return this.suspender.finally(e);
   }
 };
-var He = class {
+var Ge = class {
   constructor(e) {
-    this.storage = e ?? (typeof localStorage < "u" ? localStorage : new Wr());
+    this.storage = e ?? (typeof localStorage < "u" ? localStorage : new jr());
   }
   clear() {
     this.storage.clear();
@@ -41825,10 +41830,10 @@ var He = class {
     return t ? JSON.parse(t) : void 0;
   }
   setObject(e, t) {
-    this.setString(e, t ? lt(t) : void 0);
+    this.setString(e, t ? ut(t) : void 0);
   }
 };
-var Wr = class {
+var jr = class {
   constructor() {
     this.data = /* @__PURE__ */ new Map();
   }
@@ -41851,15 +41856,15 @@ var Wr = class {
     return Array.from(this.data.keys())[e];
   }
 };
-var De = { Event: typeof globalThis.Event < "u" ? globalThis.Event : void 0, ErrorEvent: void 0, CloseEvent: void 0 };
+var Me = { Event: typeof globalThis.Event < "u" ? globalThis.Event : void 0, ErrorEvent: void 0, CloseEvent: void 0 };
 var wi = false;
-function ea() {
+function ta() {
   if (typeof globalThis.Event > "u") throw new Error("Unable to lazy init events for ReconnectingWebSocket. globalThis.Event is not defined yet");
-  De.Event = globalThis.Event, De.ErrorEvent = class extends Event {
+  Me.Event = globalThis.Event, Me.ErrorEvent = class extends Event {
     constructor(e, t) {
       super("error", t), this.message = e.message, this.error = e;
     }
-  }, De.CloseEvent = class extends Event {
+  }, Me.CloseEvent = class extends Event {
     constructor(t = 1e3, n = "", i) {
       super("close", i);
       this.wasClean = true;
@@ -41867,17 +41872,17 @@ function ea() {
     }
   };
 }
-function ta(r7, e) {
+function ra(r7, e) {
   if (!r7) throw new Error(e);
 }
 function Mt(r7) {
   return new r7.constructor(r7.type, r7);
 }
-var Te = { maxReconnectionDelay: 1e4, minReconnectionDelay: 1e3 + Math.random() * 4e3, minUptime: 5e3, reconnectionDelayGrowFactor: 1.3, connectionTimeout: 4e3, maxRetries: 1 / 0, maxEnqueuedMessages: 1 / 0, startClosed: false, debug: false };
+var Se = { maxReconnectionDelay: 1e4, minReconnectionDelay: 1e3 + Math.random() * 4e3, minUptime: 5e3, reconnectionDelayGrowFactor: 1.3, connectionTimeout: 4e3, maxRetries: 1 / 0, maxEnqueuedMessages: 1 / 0, startClosed: false, debug: false };
 var Ai = false;
-var _t = class r extends H {
+var _t = class r extends K {
   constructor(t, n, i = {}) {
-    wi || (ea(), wi = true);
+    wi || (ta(), wi = true);
     super();
     this._retryCount = -1;
     this._shouldReconnect = true;
@@ -41891,8 +41896,8 @@ var _t = class r extends H {
     this.onopen = null;
     this._handleOpen = (t2) => {
       this._debug("open event");
-      let { minUptime: n2 = Te.minUptime } = this._options;
-      clearTimeout(this._connectTimeout), this._uptimeTimeout = setTimeout(() => this._acceptOpen(), n2), ta(this._ws, "WebSocket is not defined"), this._ws.binaryType = this._binaryType, this._messageQueue.forEach((i2) => this._ws?.send(i2)), this._messageQueue = [], this.onopen && this.onopen(t2), this.dispatchEvent(Mt(t2));
+      let { minUptime: n2 = Se.minUptime } = this._options;
+      clearTimeout(this._connectTimeout), this._uptimeTimeout = setTimeout(() => this._acceptOpen(), n2), ra(this._ws, "WebSocket is not defined"), this._ws.binaryType = this._binaryType, this._messageQueue.forEach((i2) => this._ws?.send(i2)), this._messageQueue = [], this.onopen && this.onopen(t2), this.dispatchEvent(Mt(t2));
     };
     this._handleMessage = (t2) => {
       this._debug("message event"), this.onmessage && this.onmessage(t2), this.dispatchEvent(Mt(t2));
@@ -41973,7 +41978,7 @@ var _t = class r extends H {
   send(t) {
     if (this._ws && this._ws.readyState === this.OPEN) this._debug("send", t), this._ws.send(t);
     else {
-      let { maxEnqueuedMessages: n = Te.maxEnqueuedMessages } = this._options;
+      let { maxEnqueuedMessages: n = Se.maxEnqueuedMessages } = this._options;
       this._messageQueue.length < n && (this._debug("enqueue", t), this._messageQueue.push(t));
     }
   }
@@ -41981,7 +41986,7 @@ var _t = class r extends H {
     this._options.debug && this._debugLogger("RWS>", ...t);
   }
   _getNextDelay() {
-    let { reconnectionDelayGrowFactor: t = Te.reconnectionDelayGrowFactor, minReconnectionDelay: n = Te.minReconnectionDelay, maxReconnectionDelay: i = Te.maxReconnectionDelay } = this._options, o = 0;
+    let { reconnectionDelayGrowFactor: t = Se.reconnectionDelayGrowFactor, minReconnectionDelay: n = Se.minReconnectionDelay, maxReconnectionDelay: i = Se.maxReconnectionDelay } = this._options, o = 0;
     return this._retryCount > 0 && (o = n * Math.pow(t, this._retryCount - 1), o > i && (o = i)), this._debug("next delay", o), o;
   }
   _wait() {
@@ -41992,7 +41997,7 @@ var _t = class r extends H {
   _connect() {
     if (this._connectLock || !this._shouldReconnect) return;
     this._connectLock = true;
-    let { maxRetries: t = Te.maxRetries, connectionTimeout: n = Te.connectionTimeout } = this._options;
+    let { maxRetries: t = Se.maxRetries, connectionTimeout: n = Se.connectionTimeout } = this._options;
     if (this._retryCount >= t) {
       this._debug("max retries reached", this._retryCount, ">=", t);
       return;
@@ -42006,17 +42011,17 @@ var _t = class r extends H {
       let i = this._options.WebSocket || WebSocket;
       this._debug("connect", { url: this._url, protocols: this._protocols }), this._ws = this._protocols ? new i(this._url, this._protocols) : new i(this._url), this._ws.binaryType = this._binaryType, this._connectLock = false, this._addListeners(), this._connectTimeout = setTimeout(() => this._handleTimeout(), n);
     }).catch((i) => {
-      this._connectLock = false, this._handleError(new De.ErrorEvent(Error(i.message), this));
+      this._connectLock = false, this._handleError(new Me.ErrorEvent(Error(i.message), this));
     });
   }
   _handleTimeout() {
-    this._debug("timeout event"), this._handleError(new De.ErrorEvent(Error("TIMEOUT"), this));
+    this._debug("timeout event"), this._handleError(new Me.ErrorEvent(Error("TIMEOUT"), this));
   }
   _disconnect(t = 1e3, n) {
     if (this._clearTimeouts(), !!this._ws) {
       this._removeListeners();
       try {
-        this._ws.close(t, n), this._handleClose(new De.CloseEvent(t, n, this));
+        this._ws.close(t, n), this._handleClose(new Me.CloseEvent(t, n, this));
       } catch {
       }
     }
@@ -42034,8 +42039,8 @@ var _t = class r extends H {
     clearTimeout(this._connectTimeout), clearTimeout(this._uptimeTimeout);
   }
 };
-var ra = 5e3;
-var Qe = class extends H {
+var na = 5e3;
+var He = class extends K {
   constructor(...e) {
     super(), this.criteria = new Set(e);
   }
@@ -42049,10 +42054,10 @@ var Qe = class extends H {
     this.criteria.delete(e);
   }
 };
-var jr = class {
+var Wr = class {
   constructor(e, t) {
     this.connecting = false;
-    this.criteria = e, this.emitter = new Qe(e), this.refCount = 1, this.subscriptionProps = t ? { ...t } : void 0;
+    this.criteria = e, this.emitter = new He(e), this.refCount = 1, this.subscriptionProps = t ? { ...t } : void 0;
   }
   clearAttachedSubscription() {
     this.subscriptionId = void 0, this.token = void 0;
@@ -42070,7 +42075,7 @@ var Nt = class {
       throw new d(h("Not a valid URL"));
     }
     let o = n?.ReconnectingWebSocket ? new n.ReconnectingWebSocket(i, void 0, { debug: n?.debug, debugLogger: n?.debugLogger }) : new _t(i, void 0, { debug: n?.debug, debugLogger: n?.debugLogger });
-    this.medplum = e, this.ws = o, this.masterSubEmitter = new Qe(), this.criteriaEntries = /* @__PURE__ */ new Map(), this.criteriaEntriesBySubscriptionId = /* @__PURE__ */ new Map(), this.wsClosed = false, this.pingIntervalMs = n?.pingIntervalMs ?? ra, this.currentProfile = e.getProfile(), this.setupListeners();
+    this.medplum = e, this.ws = o, this.masterSubEmitter = new He(), this.criteriaEntries = /* @__PURE__ */ new Map(), this.criteriaEntriesBySubscriptionId = /* @__PURE__ */ new Map(), this.wsClosed = false, this.pingIntervalMs = n?.pingIntervalMs ?? na, this.currentProfile = e.getProfile(), this.setupListeners();
   }
   setupListeners() {
     let e = this.ws;
@@ -42087,7 +42092,7 @@ var Nt = class {
           return;
         }
         if (o.type === "handshake") {
-          let a2 = de(o.subscription), c = { type: "connect", payload: { subscriptionId: a2 } };
+          let a2 = fe(o.subscription), c = { type: "connect", payload: { subscriptionId: a2 } };
           this.masterSubEmitter?.dispatchEvent(c);
           let u2 = this.criteriaEntriesBySubscriptionId.get(a2);
           if (!u2) {
@@ -42098,7 +42103,7 @@ var Nt = class {
           return;
         }
         this.masterSubEmitter?.dispatchEvent({ type: "message", payload: i });
-        let s = this.criteriaEntriesBySubscriptionId.get(de(o.subscription));
+        let s = this.criteriaEntriesBySubscriptionId.get(fe(o.subscription));
         if (!s) {
           console.warn("Received notification for criteria the SubscriptionManager is not listening for");
           return;
@@ -42148,7 +42153,7 @@ var Nt = class {
   }
   async getTokenForCriteria(e) {
     let t = e?.subscriptionId;
-    t || (t = (await this.medplum.createResource({ ...e.subscriptionProps, resourceType: "Subscription", status: "active", reason: `WebSocket subscription for ${pe(this.medplum.getProfile())}`, channel: { type: "websocket" }, criteria: e.criteria })).id);
+    t || (t = (await this.medplum.createResource({ ...e.subscriptionProps, resourceType: "Subscription", status: "active", reason: `WebSocket subscription for ${de(this.medplum.getProfile())}`, channel: { type: "websocket" }, criteria: e.criteria })).id);
     let { parameter: n } = await this.medplum.get(`fhir/R4/Subscription/${t}/$get-ws-binding-token`), i = n?.find((s) => s.name === "token")?.valueString, o = n?.find((s) => s.name === "websocket-url")?.valueUrl;
     if (!i) throw new d(h("Failed to get token"));
     if (!o) throw new d(h("Failed to get URL from $get-ws-binding-token"));
@@ -42158,7 +42163,7 @@ var Nt = class {
     let n = this.criteriaEntries.get(e);
     if (n) {
       if (!t) return n.bareCriteria;
-      for (let i of n.criteriaWithProps) if (ee(t, i.subscriptionProps)) return i;
+      for (let i of n.criteriaWithProps) if (te(t, i.subscriptionProps)) return i;
     }
   }
   getAllCriteriaEmitters() {
@@ -42179,7 +42184,7 @@ var Nt = class {
     let s = this.criteriaEntries.get(t);
     n ? s.criteriaWithProps = s.criteriaWithProps.filter((a2) => {
       let c = a2.subscriptionProps;
-      return !ee(n, c);
+      return !te(n, c);
     }) : s.bareCriteria = void 0, !s.bareCriteria && s.criteriaWithProps.length === 0 && (this.criteriaEntries.delete(t), this.masterSubEmitter?._removeCriteria(t)), i && this.criteriaEntriesBySubscriptionId.delete(i), o && this.ws.readyState === WebSocket.OPEN && this.ws.send(JSON.stringify({ type: "unbind-from-token", payload: { token: o } }));
   }
   async subscribeToCriteria(e) {
@@ -42189,7 +42194,7 @@ var Nt = class {
         let [t, n] = await this.getTokenForCriteria(e);
         e.subscriptionId = t, e.token = n, this.criteriaEntriesBySubscriptionId.set(t, e), this.ws.send(JSON.stringify({ type: "bind-with-token", payload: { token: n } }));
       } catch (t) {
-        console.error(Re(t)), this.emitError(e, t), this.removeCriteriaEntry(e);
+        console.error(Ce(t)), this.emitError(e, t), this.removeCriteriaEntry(e);
       }
     }
   }
@@ -42201,7 +42206,7 @@ var Nt = class {
     this.masterSubEmitter && this.masterSubEmitter._addCriteria(e);
     let n = this.maybeGetCriteriaEntry(e, t);
     if (n) return n.refCount += 1, n.emitter;
-    let i = new jr(e, t);
+    let i = new Wr(e, t);
     return this.addCriteriaEntry(i), this.subscribeToCriteria(i).catch(console.error), i.emitter;
   }
   removeCriteria(e, t) {
@@ -42225,28 +42230,28 @@ var Nt = class {
     return this.getAllCriteriaEmitters().length;
   }
   getMasterEmitter() {
-    return this.masterSubEmitter || (this.masterSubEmitter = new Qe(...Array.from(this.criteriaEntries.keys()))), this.masterSubEmitter;
+    return this.masterSubEmitter || (this.masterSubEmitter = new He(...Array.from(this.criteriaEntries.keys()))), this.masterSubEmitter;
   }
 };
-var $r = "3.2.27-4cec0e5ad";
-var oa = D.FHIR_JSON + ", */*; q=0.1";
-var sa = "https://api.medplum.com/";
-var aa = 1e3;
-var ca = 6e4;
-var ua = 0;
-var la = 3e5;
-var pa = "Binary/";
+var $r = "3.2.29-0599668c1";
+var sa = A.FHIR_JSON + ", */*; q=0.1";
+var aa = "https://api.medplum.com/";
+var ca = 1e3;
+var ua = 6e4;
+var la = 0;
+var pa = 3e5;
+var da = "Binary/";
 var Oi = { resourceType: "Device", id: "system", deviceName: [{ type: "model-name", name: "System" }] };
-var da = ((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))(da || {});
-var fa = ((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))(fa || {});
-var ma = ((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))(ma || {});
-var ha = ((e) => (e.JwtBearer = "urn:ietf:params:oauth:client-assertion-type:jwt-bearer", e))(ha || {});
-var Lt = class extends H {
+var fa = ((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))(fa || {});
+var ma = ((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))(ma || {});
+var ha = ((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))(ha || {});
+var ya = ((e) => (e.JwtBearer = "urn:ietf:params:oauth:client-assertion-type:jwt-bearer", e))(ya || {});
+var Lt = class extends K {
   constructor(t) {
     super();
     this.initComplete = true;
     if (t?.baseUrl && !t.baseUrl.startsWith("http")) throw new Error("Base URL must start with http or https");
-    this.options = t ?? {}, this.fetch = t?.fetch ?? ya(), this.storage = t?.storage ?? new He(), this.createPdfImpl = t?.createPdf, this.baseUrl = Pr(t?.baseUrl ?? sa), this.fhirBaseUrl = B(this.baseUrl, t?.fhirUrlPath ?? "fhir/R4"), this.authorizeUrl = B(this.baseUrl, t?.authorizeUrl ?? "oauth2/authorize"), this.tokenUrl = B(this.baseUrl, t?.tokenUrl ?? "oauth2/token"), this.logoutUrl = B(this.baseUrl, t?.logoutUrl ?? "oauth2/logout"), this.fhircastHubUrl = B(this.baseUrl, t?.fhircastHubUrl ?? "fhircast/STU3"), this.clientId = t?.clientId ?? "", this.clientSecret = t?.clientSecret ?? "", this.defaultHeaders = t?.defaultHeaders ?? {}, this.onUnauthenticated = t?.onUnauthenticated, this.refreshGracePeriod = t?.refreshGracePeriod ?? la, this.cacheTime = t?.cacheTime ?? (typeof window > "u" ? ua : ca), this.cacheTime > 0 ? this.requestCache = new Ot(t?.resourceCacheSize ?? aa) : 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.storage.getInitPromise === void 0 ? (t?.accessToken || this.attemptResumeActiveLogin().catch(console.error), this.initPromise = Promise.resolve(), this.dispatchEvent({ type: "storageInitialized" })) : (this.initComplete = false, this.initPromise = this.storage.getInitPromise(), this.initPromise.then(() => {
+    this.options = t ?? {}, this.fetch = t?.fetch ?? ga(), this.storage = t?.storage ?? new Ge(), this.createPdfImpl = t?.createPdf, this.baseUrl = Pr(t?.baseUrl ?? aa), this.fhirBaseUrl = q(this.baseUrl, t?.fhirUrlPath ?? "fhir/R4"), this.authorizeUrl = q(this.baseUrl, t?.authorizeUrl ?? "oauth2/authorize"), this.tokenUrl = q(this.baseUrl, t?.tokenUrl ?? "oauth2/token"), this.logoutUrl = q(this.baseUrl, t?.logoutUrl ?? "oauth2/logout"), this.fhircastHubUrl = q(this.baseUrl, t?.fhircastHubUrl ?? "fhircast/STU3"), this.clientId = t?.clientId ?? "", this.clientSecret = t?.clientSecret ?? "", this.defaultHeaders = t?.defaultHeaders ?? {}, this.onUnauthenticated = t?.onUnauthenticated, this.refreshGracePeriod = t?.refreshGracePeriod ?? pa, this.cacheTime = t?.cacheTime ?? (typeof window > "u" ? la : ua), this.cacheTime > 0 ? this.requestCache = new Ot(t?.resourceCacheSize ?? ca) : 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.storage.getInitPromise === void 0 ? (t?.accessToken || this.attemptResumeActiveLogin().catch(console.error), this.initPromise = Promise.resolve(), this.dispatchEvent({ type: "storageInitialized" })) : (this.initComplete = false, this.initPromise = this.storage.getInitPromise(), this.initPromise.then(() => {
       t?.accessToken || this.attemptResumeActiveLogin().catch(console.error), this.initComplete = true, this.dispatchEvent({ type: "storageInitialized" });
     }).catch((n) => {
       console.error(n), this.initComplete = true, this.dispatchEvent({ type: "storageInitFailed", payload: { error: n } });
@@ -42293,7 +42298,7 @@ var Lt = class extends H {
     this.requestCache?.clear();
   }
   invalidateSearches(t) {
-    let n = B(this.fhirBaseUrl, t);
+    let n = q(this.fhirBaseUrl, t);
     if (this.requestCache) for (let i of this.requestCache.keys()) (i.endsWith(n) || i.includes(n + "?")) && this.requestCache.delete(i);
   }
   get(t, n = {}) {
@@ -42301,7 +42306,7 @@ var Lt = class extends H {
     let i = this.getCacheEntry(t, n);
     if (i) return i.value;
     let o;
-    t.startsWith(this.fhirBaseUrl) && this.autoBatchQueue ? o = new Promise((a2, c) => {
+    t.startsWith(this.fhirBaseUrl) && this.autoBatchQueue && !n.disableAutoBatch ? o = new Promise((a2, c) => {
       this.autoBatchQueue.push({ method: "GET", url: t.replace(this.fhirBaseUrl, ""), options: n, resolve: a2, reject: c }), this.autoBatchTimerId || (this.autoBatchTimerId = setTimeout(() => this.executeAutoBatch(), this.autoBatchTime));
     }) : o = this.request("GET", t, n);
     let s = new M(o);
@@ -42314,7 +42319,7 @@ var Lt = class extends H {
     return t = t.toString(), this.setRequestBody(o, n), i && this.setRequestContentType(o, i), this.invalidateUrl(t), this.request("PUT", t, o);
   }
   patch(t, n, i = {}) {
-    return t = t.toString(), this.setRequestBody(i, n), this.setRequestContentType(i, D.JSON_PATCH), this.invalidateUrl(t), this.request("PATCH", t, i);
+    return t = t.toString(), this.setRequestBody(i, n), this.setRequestContentType(i, A.JSON_PATCH), this.invalidateUrl(t), this.request("PATCH", t, i);
   }
   delete(t, n) {
     return t = t.toString(), this.invalidateUrl(t), this.request("DELETE", t, n);
@@ -42372,18 +42377,18 @@ var Lt = class extends H {
     return a2.toString();
   }
   fhirUrl(...t) {
-    return new URL(B(this.fhirBaseUrl, t.join("/")));
+    return new URL(q(this.fhirBaseUrl, t.join("/")));
   }
   fhirSearchUrl(t, n) {
     let i = this.fhirUrl(t);
-    return n && (i.search = Jn(n)), i;
+    return n && (i.search = Yn(n)), i;
   }
   search(t, n, i) {
     let o = this.fhirSearchUrl(t, n), s = "search-" + o.toString(), a2 = this.getCacheEntry(s, i);
     if (a2) return a2.value;
     let c = new M((async () => {
       let u2 = await this.get(o, i);
-      if (u2.entry) for (let p2 of u2.entry) this.cacheResource(p2.resource);
+      if (u2.entry) for (let l2 of u2.entry) this.cacheResource(l2.resource);
       return u2;
     })());
     return this.setCacheEntry(s, c), c;
@@ -42535,37 +42540,51 @@ var Lt = class extends H {
     return s || (s = t), this.cacheResource(s), this.invalidateUrl(this.fhirUrl(t.resourceType, t.id, "_history")), this.invalidateSearches(t.resourceType), s;
   }
   async createAttachment(t, n, i, o, s) {
-    let a2 = Di(t, n, i, o), c = s ?? (typeof n == "object" ? n : {}), u2 = await this.createBinary(a2, c);
+    let a2 = Di(t, n, i, o);
+    if (a2.contentType === A.XML) {
+      let l2 = a2.data, m2;
+      l2 instanceof Blob ? m2 = await new Promise((x2, B) => {
+        let W = new FileReader();
+        W.onload = () => {
+          if (!W.result) {
+            B(new Error("Failed to load file"));
+            return;
+          }
+          x2(W.result);
+        }, W.readAsText(l2, "utf-8");
+      }) : ArrayBuffer.isView(l2) ? m2 = new TextDecoder().decode(l2) : m2 = l2, m2.includes("<ClinicalDocument") && m2.includes("urn:hl7-org:v3") && (a2 = { ...a2, contentType: A.CDA_XML });
+    }
+    let c = s ?? (typeof n == "object" ? n : {}), u2 = await this.createBinary(a2, c);
     return { contentType: a2.contentType, url: u2.url, title: a2.filename };
   }
   createBinary(t, n, i, o, s) {
-    let a2 = Di(t, n, i, o), c = s ?? (typeof n == "object" ? n : {}), { data: u2, contentType: p2, filename: m2, securityContext: x2, onProgress: Q } = a2, Ne = this.fhirUrl("Binary");
-    return m2 && Ne.searchParams.set("_filename", m2), x2?.reference && this.setRequestHeader(c, "X-Security-Context", x2.reference), Q ? this.uploadwithProgress(Ne, u2, p2, Q, c) : this.post(Ne, u2, p2, c);
+    let a2 = Di(t, n, i, o), c = s ?? (typeof n == "object" ? n : {}), { data: u2, contentType: l2, filename: m2, securityContext: x2, onProgress: B } = a2, W = this.fhirUrl("Binary");
+    return m2 && W.searchParams.set("_filename", m2), x2?.reference && this.setRequestHeader(c, "X-Security-Context", x2.reference), B ? this.uploadwithProgress(W, u2, l2, B, c) : this.post(W, u2, l2, c);
   }
   uploadwithProgress(t, n, i, o, s) {
     return new Promise((a2, c) => {
-      let u2 = new XMLHttpRequest(), p2 = () => u2.abort();
-      s?.signal?.addEventListener("abort", p2);
+      let u2 = new XMLHttpRequest(), l2 = () => u2.abort();
+      s?.signal?.addEventListener("abort", l2);
       let m2 = (x2) => {
-        s?.signal?.removeEventListener("abort", p2), x2 instanceof Error ? c(x2) : a2(x2);
+        s?.signal?.removeEventListener("abort", l2), x2 instanceof Error ? c(x2) : a2(x2);
       };
       if (u2.responseType = "json", u2.onabort = () => m2(new DOMException("Request aborted", "AbortError")), u2.onerror = () => m2(new Error("Request error")), o && (u2.upload.onprogress = (x2) => o(x2), u2.upload.onload = (x2) => o(x2)), u2.onload = () => {
-        u2.status >= 200 && u2.status < 300 ? m2(u2.response) : m2(new d(tt(u2.response || u2.statusText)));
+        u2.status >= 200 && u2.status < 300 ? m2(u2.response) : m2(new d(et(u2.response || u2.statusText)));
       }, u2.open("POST", t), u2.withCredentials = true, u2.setRequestHeader("Authorization", "Bearer " + this.accessToken), u2.setRequestHeader("Cache-Control", "no-cache, no-store, max-age=0"), u2.setRequestHeader("Content-Type", i), this.options.extendedMode !== false && u2.setRequestHeader("X-Medplum", "extended"), s?.headers) {
         let x2 = s.headers;
-        for (let [Q, Ne] of Object.entries(x2)) u2.setRequestHeader(Q, Ne);
+        for (let [B, W] of Object.entries(x2)) u2.setRequestHeader(B, W);
       }
       u2.send(n);
     });
   }
   async createPdf(t, n, i, o) {
     if (!this.createPdfImpl) throw new Error("PDF creation not enabled");
-    let s = va(t, n, i, o), a2 = typeof n == "object" ? n : {}, { docDefinition: c, tableLayouts: u2, fonts: p2, ...m2 } = s, x2 = await this.createPdfImpl(c, u2, p2), Q = { ...m2, data: x2, contentType: "application/pdf" };
-    return this.createBinary(Q, a2);
+    let s = Ta(t, n, i, o), a2 = typeof n == "object" ? n : {}, { docDefinition: c, tableLayouts: u2, fonts: l2, ...m2 } = s, x2 = await this.createPdfImpl(c, u2, l2), B = { ...m2, data: x2, contentType: "application/pdf" };
+    return this.createBinary(B, a2);
   }
   createComment(t, n, i) {
     let o = this.getProfile(), s, a2;
-    return t.resourceType === "Encounter" && (s = te(t), a2 = t.subject), t.resourceType === "ServiceRequest" && (s = t.encounter, a2 = t.subject), t.resourceType === "Patient" && (a2 = te(t)), this.createResource({ resourceType: "Communication", status: "completed", basedOn: [te(t)], encounter: s, subject: a2, sender: o ? te(o) : void 0, sent: (/* @__PURE__ */ new Date()).toISOString(), payload: [{ contentString: n }] }, i);
+    return t.resourceType === "Encounter" && (s = re(t), a2 = t.subject), t.resourceType === "ServiceRequest" && (s = t.encounter, a2 = t.subject), t.resourceType === "Patient" && (a2 = re(t)), this.createResource({ resourceType: "Communication", status: "completed", basedOn: [re(t)], encounter: s, subject: a2, sender: o ? re(o) : void 0, sent: (/* @__PURE__ */ new Date()).toISOString(), payload: [{ contentString: n }] }, i);
   }
   async updateResource(t, n) {
     if (!t.resourceType) throw new Error("Missing resourceType");
@@ -42598,22 +42617,22 @@ var Lt = class extends H {
     return this.post(this.fhirBaseUrl, t, void 0, n);
   }
   sendEmail(t, n) {
-    return this.post("email/v1/send", t, D.JSON, n);
+    return this.post("email/v1/send", t, A.JSON, n);
   }
   graphql(t, n, i, o) {
-    return this.post(this.fhirUrl("$graphql"), { query: t, operationName: n, variables: i }, D.JSON, o);
+    return this.post(this.fhirUrl("$graphql"), { query: t, operationName: n, variables: i }, A.JSON, o);
   }
   readResourceGraph(t, n, i, o) {
     return this.get(`${this.fhirUrl(t, n)}/$graph?graph=${i}`, o);
   }
   pushToAgent(t, n, i, o, s, a2) {
-    return this.post(this.fhirUrl("Agent", de(t), "$push"), { destination: typeof n == "string" ? n : pe(n), body: i, contentType: o, waitForResponse: s }, D.FHIR_JSON, a2);
+    return this.post(this.fhirUrl("Agent", fe(t), "$push"), { destination: typeof n == "string" ? n : de(n), body: i, contentType: o, waitForResponse: s }, A.FHIR_JSON, a2);
   }
   getActiveLogin() {
     return this.storage.getObject("activeLogin");
   }
   async setActiveLogin(t) {
-    (!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();
+    (!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();
   }
   getAccessToken() {
     return this.accessToken;
@@ -42670,13 +42689,13 @@ var Lt = class extends H {
   async download(t, n = {}) {
     this.refreshPromise && await this.refreshPromise;
     let i = t.toString();
-    i.startsWith(pa) && (t = this.fhirUrl(i));
+    i.startsWith(da) && (t = this.fhirUrl(i));
     let o = n.headers;
     return o || (o = {}, n.headers = o), o.Accept || (o.Accept = "*/*"), this.addFetchOptionsDefaults(n), (await this.fetchWithRetry(t.toString(), n)).blob();
   }
   async createMedia(t, n) {
     let { additionalFields: i, ...o } = t, s = await this.createResource({ resourceType: "Media", status: "preparation", content: { contentType: t.contentType }, ...i });
-    o.securityContext || (o.securityContext = te(s));
+    o.securityContext || (o.securityContext = re(s));
     let a2 = await this.createAttachment(o, n);
     return this.updateResource({ ...s, status: "completed", content: a2 });
   }
@@ -42718,14 +42737,14 @@ var Lt = class extends H {
     if (s.status === 404 && !c) throw new d(cn);
     let u2 = await this.parseBody(s, c);
     if (s.status === 200 && i.followRedirectOnOk || s.status === 201 && i.followRedirectOnCreated) {
-      let p2 = await ki(s, u2);
-      if (p2) return this.request("GET", p2, { ...i, body: void 0 });
+      let l2 = await ki(s, u2);
+      if (l2) return this.request("GET", l2, { ...i, body: void 0 });
     }
     if (s.status === 202 && i.pollStatusOnAccepted) {
       let m2 = await ki(s, u2) ?? o.statusUrl;
       if (m2) return this.pollStatus(m2, i, o);
     }
-    if (s.status >= 400) throw new d(tt(u2));
+    if (s.status >= 400) throw new d(et(u2));
     return u2;
   }
   async parseBody(t, n) {
@@ -42741,7 +42760,7 @@ var Lt = class extends H {
     }
   }
   async fetchWithRetry(t, n) {
-    t.startsWith("http") || (t = B(this.baseUrl, t));
+    t.startsWith("http") || (t = q(this.baseUrl, t));
     let i = n?.maxRetries ?? 2, o = 200;
     for (let s = 0; s <= i; s++) {
       try {
@@ -42758,7 +42777,7 @@ var Lt = class extends H {
   logRequest(t, n) {
     if (console.log(`> ${n.method} ${t}`), n.headers) {
       let i = n.headers;
-      for (let o of pt(Object.keys(i))) console.log(`> ${o}: ${i[o]}`);
+      for (let o of lt(Object.keys(i))) console.log(`> ${o}: ${i[o]}`);
     }
   }
   logResponse(t) {
@@ -42779,9 +42798,9 @@ var Lt = class extends H {
     if (this.autoBatchQueue.length = 0, this.autoBatchTimerId = void 0, t.length === 1) {
       let o = t[0];
       try {
-        o.resolve(await this.request(o.method, B(this.fhirBaseUrl, o.url), o.options));
+        o.resolve(await this.request(o.method, q(this.fhirBaseUrl, o.url), o.options));
       } catch (s) {
-        o.reject(new d(tt(s)));
+        o.reject(new d(et(s)));
       }
       return;
     }
@@ -42794,7 +42813,7 @@ var Lt = class extends H {
   addFetchOptionsDefaults(t) {
     Object.entries(this.defaultHeaders).forEach(([n, i]) => {
       this.setRequestHeader(t, n, i);
-    }), this.setRequestHeader(t, "Accept", oa, true), this.options.extendedMode !== false && this.setRequestHeader(t, "X-Medplum", "extended"), t.body && this.setRequestHeader(t, "Content-Type", D.FHIR_JSON, true), this.accessToken ? this.setRequestHeader(t, "Authorization", "Bearer " + this.accessToken) : this.basicAuth && this.setRequestHeader(t, "Authorization", "Basic " + this.basicAuth), t.cache || (t.cache = "no-cache"), t.credentials || (t.credentials = "include");
+    }), this.setRequestHeader(t, "Accept", sa, true), this.options.extendedMode !== false && this.setRequestHeader(t, "X-Medplum", "extended"), t.body && this.setRequestHeader(t, "Content-Type", A.FHIR_JSON, true), this.accessToken ? this.setRequestHeader(t, "Authorization", "Bearer " + this.accessToken) : this.basicAuth && this.setRequestHeader(t, "Authorization", "Basic " + this.basicAuth), t.cache || (t.cache = "no-cache"), t.credentials || (t.credentials = "include");
   }
   setRequestContentType(t, n) {
     this.setRequestHeader(t, "Content-Type", n);
@@ -42808,14 +42827,14 @@ var Lt = class extends H {
     typeof n == "string" || typeof Blob < "u" && (n instanceof Blob || n?.constructor.name === "Blob") || typeof File < "u" && (n instanceof File || n?.constructor.name === "File") || typeof Uint8Array < "u" && (n instanceof Uint8Array || n?.constructor.name === "Uint8Array") ? t.body = n : n && (t.body = JSON.stringify(n));
   }
   handleUnauthenticated(t, n, i) {
-    return this.refresh() ? this.request(t, n, i) : (this.clear(), this.onUnauthenticated && this.onUnauthenticated(), Promise.reject(new d(Ee)));
+    return this.refresh() ? this.request(t, n, i) : (this.clear(), this.onUnauthenticated && this.onUnauthenticated(), Promise.reject(new d(be)));
   }
   async startPkce() {
     let t = Nr();
     sessionStorage.setItem("pkceState", t);
     let n = Nr().slice(0, 128);
     sessionStorage.setItem("codeVerifier", n);
-    let i = await yi(n), o = $n(i).replaceAll("+", "-").replaceAll("/", "_").replaceAll("=", "");
+    let i = await yi(n), o = Gn(i).replaceAll("+", "-").replaceAll("/", "_").replaceAll("=", "");
     return sessionStorage.setItem("codeChallenge", o), { codeChallengeMethod: "S256", codeChallenge: o };
   }
   async requestAuthorization(t) {
@@ -42861,20 +42880,20 @@ var Lt = class extends H {
   async fhircastSubscribe(t, n) {
     if (!(typeof t == "string" && t !== "")) 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 d(h("Invalid events provided. Events must be an array of event names containing at least one event."));
-    let i = { channelType: "websocket", mode: "subscribe", topic: t, events: n }, s = (await this.post(this.fhircastHubUrl, Br(i), D.FORM_URL_ENCODED))["hub.channel.endpoint"];
+    let i = { channelType: "websocket", mode: "subscribe", topic: t, events: n }, s = (await this.post(this.fhircastHubUrl, Br(i), A.FORM_URL_ENCODED))["hub.channel.endpoint"];
     if (!s) throw new Error("Invalid response!");
     return i.endpoint = s, i;
   }
   async fhircastUnsubscribe(t) {
     if (!kt(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 d(h("Provided subscription request must have an endpoint in order to unsubscribe."));
-    t.mode = "unsubscribe", await this.post(this.fhircastHubUrl, Br(t), D.FORM_URL_ENCODED);
+    t.mode = "unsubscribe", await this.post(this.fhircastHubUrl, Br(t), A.FORM_URL_ENCODED);
   }
   fhircastConnect(t) {
     return new It(t);
   }
   async fhircastPublish(t, n, i, o) {
-    return vi(n) ? this.post(this.fhircastHubUrl, qr(t, n, i, o), D.JSON) : (Ti(n), this.post(this.fhircastHubUrl, qr(t, n, i), D.JSON));
+    return vi(n) ? this.post(this.fhircastHubUrl, qr(t, n, i, o), A.JSON) : (Ti(n), this.post(this.fhircastHubUrl, qr(t, n, i), A.JSON));
   }
   async fhircastGetContext(t) {
     return this.get(`${this.fhircastHubUrl}/${t}`);
@@ -42883,7 +42902,7 @@ var Lt = class extends H {
     return this.post("admin/projects/" + t + "/invite", n);
   }
   async fetchTokens(t) {
-    let n = { method: "POST", headers: { "Content-Type": D.FORM_URL_ENCODED }, body: t.toString(), credentials: "include" }, i = n.headers;
+    let n = { method: "POST", headers: { "Content-Type": A.FORM_URL_ENCODED }, body: t.toString(), credentials: "include" }, i = n.headers;
     Object.assign(i, this.defaultHeaders), this.basicAuth && (i.Authorization = `Basic ${this.basicAuth}`);
     let o;
     try {
@@ -42930,7 +42949,7 @@ var Lt = class extends H {
     }
   }
   getSubscriptionManager() {
-    return this.subscriptionManager || (this.subscriptionManager = new Nt(this, zn(this.baseUrl, "/ws/subscriptions-r4"))), this.subscriptionManager;
+    return this.subscriptionManager || (this.subscriptionManager = new Nt(this, Jn(this.baseUrl, "/ws/subscriptions-r4"))), this.subscriptionManager;
   }
   subscribeToCriteria(t, n) {
     return this.getSubscriptionManager().addCriteria(t, n);
@@ -42942,7 +42961,7 @@ var Lt = class extends H {
     return this.getSubscriptionManager().getMasterEmitter();
   }
 };
-function ya() {
+function ga() {
   if (!globalThis.fetch) throw new Error("Fetch not available in this environment");
   return globalThis.fetch.bind(globalThis);
 }
@@ -42954,30 +42973,30 @@ async function ki(r7, e) {
   if (t) return t;
   let n = r7.headers.get("location");
   if (n) return n;
-  if (be(e) && e.issue?.[0]?.diagnostics) return e.issue[0].diagnostics;
+  if (Re(e) && e.issue?.[0]?.diagnostics) return e.issue[0].diagnostics;
 }
 function Vi(r7) {
   let e = r7.entry?.map((t) => t.resource) ?? [];
   return Object.assign(e, { bundle: r7 });
 }
-function ga(r7) {
+function xa(r7) {
   return R(r7) && "data" in r7 && "contentType" in r7;
 }
 function Di(r7, e, t, n) {
-  return ga(r7) ? r7 : { data: r7, filename: e, contentType: t, onProgress: n };
+  return xa(r7) ? r7 : { data: r7, filename: e, contentType: t, onProgress: n };
 }
-function xa(r7) {
+function va(r7) {
   return R(r7) && "docDefinition" in r7;
 }
-function va(r7, e, t, n) {
-  return xa(r7) ? r7 : { docDefinition: r7, filename: e, tableLayouts: t, fonts: n };
+function Ta(r7, e, t, n) {
+  return va(r7) ? r7 : { docDefinition: r7, filename: e, tableLayouts: t, fonts: n };
 }
-var ka = [...je, "->", "<<", ">>", "=="];
-var Ma = $e().registerInfix("->", { precedence: y.Arrow }).registerInfix(";", { precedence: y.Semicolon });
-var Za = " ".repeat(2);
-var ec = [...je, "eq", "ne", "co"];
-var nc = $e();
-var ae = class {
+var Va = [...We, "->", "<<", ">>", "=="];
+var _a = $e().registerInfix("->", { precedence: y.Arrow }).registerInfix(";", { precedence: y.Semicolon });
+var Xa = " ".repeat(2);
+var tc = [...We, "eq", "ne", "co"];
+var ic = $e();
+var ce = class {
   constructor(e = "\r", t = "|", n = "^", i = "~", o = "\\", s = "&") {
     this.segmentSeparator = e;
     this.fieldSeparator = t;
@@ -42994,7 +43013,7 @@ var ae = class {
   }
 };
 var Yi = class r2 {
-  constructor(e, t = new ae()) {
+  constructor(e, t = new ce()) {
     this.context = t, this.segments = e;
   }
   get header() {
@@ -43017,7 +43036,7 @@ var Yi = class r2 {
   }
   buildAck() {
     let e = /* @__PURE__ */ new Date(), t = this.getSegment("MSH"), n = t?.getField(3)?.toString() ?? "", i = t?.getField(4)?.toString() ?? "", o = t?.getField(5)?.toString() ?? "", s = t?.getField(6)?.toString() ?? "", a2 = t?.getField(10)?.toString() ?? "", c = t?.getField(12)?.toString() ?? "2.5.1";
-    return new r2([new Je(["MSH", this.context.getMsh2(), o, s, n, i, oc(e), "", this.buildAckMessageType(t), e.getTime().toString(), "P", c], this.context), new Je(["MSA", "AA", a2, "OK"], this.context)]);
+    return new r2([new ze(["MSH", this.context.getMsh2(), o, s, n, i, sc(e), "", this.buildAckMessageType(t), e.getTime().toString(), "P", c], this.context), new ze(["MSA", "AA", a2, "OK"], this.context)]);
   }
   buildAckMessageType(e) {
     let t = e?.getField(9), n = t?.getComponent(2), i = t?.getComponent(3), o = "ACK";
@@ -43028,21 +43047,21 @@ var Yi = class r2 {
       let n = new Error("Invalid HL7 message");
       throw n.type = "entity.parse.failed", n;
     }
-    let t = new ae("\r", e.charAt(3), e.charAt(4), e.charAt(5), e.charAt(6), e.charAt(7));
-    return new r2(e.split(/[\r\n]+/).map((n) => Je.parse(n, t)), t);
+    let t = new ce("\r", e.charAt(3), e.charAt(4), e.charAt(5), e.charAt(6), e.charAt(7));
+    return new r2(e.split(/[\r\n]+/).map((n) => ze.parse(n, t)), t);
   }
 };
-var Je = class r3 {
-  constructor(e, t = new ae()) {
-    this.context = t, qn(e) ? this.fields = e.map((n) => _e.parse(n, t)) : this.fields = e, this.name = this.fields[0].components[0][0];
+var ze = class r3 {
+  constructor(e, t = new ce()) {
+    this.context = t, jn(e) ? this.fields = e.map((n) => Ne.parse(n, t)) : this.fields = e, this.name = this.fields[0].components[0][0];
   }
   get(e) {
     return this.fields[e];
   }
   getField(e) {
     if (this.name === "MSH") {
-      if (e === 1) return new _e([[this.context.getMsh1()]], this.context);
-      if (e === 2) return new _e([[this.context.getMsh2()]], this.context);
+      if (e === 1) return new Ne([[this.context.getMsh1()]], this.context);
+      if (e === 2) return new Ne([[this.context.getMsh2()]], this.context);
       if (e > 2) return this.fields[e - 1];
     }
     return this.fields[e];
@@ -43053,12 +43072,12 @@ var Je = class r3 {
   toString() {
     return this.fields.map((e) => e.toString()).join(this.context.fieldSeparator);
   }
-  static parse(e, t = new ae()) {
-    return new r3(e.split(t.fieldSeparator).map((n) => _e.parse(n, t)), t);
+  static parse(e, t = new ce()) {
+    return new r3(e.split(t.fieldSeparator).map((n) => Ne.parse(n, t)), t);
   }
 };
-var _e = class r4 {
-  constructor(e, t = new ae()) {
+var Ne = class r4 {
+  constructor(e, t = new ce()) {
     this.context = t, this.components = e;
   }
   get(e, t, n = 0) {
@@ -43071,11 +43090,11 @@ var _e = class r4 {
   toString() {
     return this.components.map((e) => e.join(this.context.componentSeparator)).join(this.context.repetitionSeparator);
   }
-  static parse(e, t = new ae()) {
+  static parse(e, t = new ce()) {
     return new r4(e.split(t.repetitionSeparator).map((n) => n.split(t.componentSeparator)), t);
   }
 };
-function oc(r7) {
+function sc(r7) {
   let e = r7 instanceof Date ? r7 : new Date(r7), n = e.toISOString().replace(/[-:T]/g, "").replace(/(\.\d+)?Z$/, ""), i = e.getUTCMilliseconds();
   return i > 0 && (n += "." + i.toString()), n;
 }
@@ -43113,14 +43132,14 @@ var Zi = class r5 {
 `) }), this.write(JSON.stringify({ level: Yr[e], timestamp: (/* @__PURE__ */ new Date()).toISOString(), msg: this.prefix ? `${this.prefix}${t}` : t, ...n, ...this.metadata })));
   }
 };
-function vm(r7) {
+function Tm(r7) {
   let e = Yr[r7.toUpperCase()];
   if (e === void 0) throw new Error(`Invalid log level: ${r7}`);
   return e;
 }
-var dc = "https://meta.medplum.com/releases";
+var fc = "https://meta.medplum.com/releases";
 var Kt = /* @__PURE__ */ new Map();
-function fc(r7) {
+function mc(r7) {
   let e = r7;
   if (!e.tag_name) throw new Error("Manifest missing tag_name");
   let t = e.assets;
@@ -43133,7 +43152,7 @@ function fc(r7) {
 async function Xr(r7, e, t) {
   let n = Kt.get(e ?? "latest");
   if (!n) {
-    let i = e ? `v${e}` : "latest", o = new URL(`${dc}/${i}.json`);
+    let i = e ? `v${e}` : "latest", o = new URL(`${fc}/${i}.json`);
     if (o.searchParams.set("a", r7), o.searchParams.set("c", $r), t) for (let [c, u2] of Object.entries(t)) o.searchParams.set(c, u2);
     let s = await fetch(o.toString());
     if (s.status !== 200) {
@@ -43141,20 +43160,20 @@ async function Xr(r7, e, t) {
       try {
         c = (await s.json()).message;
       } catch (u2) {
-        console.error(`Failed to parse message from body: ${Re(u2)}`);
+        console.error(`Failed to parse message from body: ${Ce(u2)}`);
       }
       throw new Error(`Received status code ${s.status} while fetching manifest for version '${e ?? "latest"}'. Message: ${c}`);
     }
     let a2 = await s.json();
-    fc(a2), n = a2, Kt.set(e ?? "latest", n), e || Kt.set(n.tag_name.slice(1), n);
+    mc(a2), n = a2, Kt.set(e ?? "latest", n), e || Kt.set(n.tag_name.slice(1), n);
   }
   return n;
 }
-function mc(r7) {
+function hc(r7) {
   return /^\d+\.\d+\.\d+$/.test(r7);
 }
-async function Mm(r7, e) {
-  if (!mc(e)) return false;
+async function _m(r7, e) {
+  if (!hc(e)) return false;
   try {
     await Xr(r7, e);
   } catch {
@@ -43162,7 +43181,7 @@ async function Mm(r7, e) {
   }
   return true;
 }
-async function _m(r7) {
+async function Nm(r7) {
   let e = await Xr(r7);
   if (!e.tag_name.startsWith("v")) throw new Error(`Invalid release name found. Release tag '${e.tag_name}' did not start with 'v'`);
   return e.tag_name.slice(1);
@@ -43196,12 +43215,12 @@ var r6 = class extends Event {
     this.error = e;
   }
 };
-var l2 = class extends Event {
+var l = class extends Event {
   constructor() {
     super("close");
   }
 };
-var p = class extends a {
+var p2 = class extends a {
   constructor(e, n = "utf-8") {
     super();
     this.socket = e;
@@ -43245,7 +43264,7 @@ var p = class extends a {
     });
   }
   close() {
-    this.socket.end(), this.socket.destroy(), this.dispatchEvent(new l2());
+    this.socket.end(), this.socket.destroy(), this.dispatchEvent(new l());
   }
   appendData(e) {
     this.chunks.push(e);
@@ -43262,7 +43281,7 @@ var m = class extends a {
     return this.connection ? Promise.resolve(this.connection) : new Promise((t, e) => {
       let n = (0, import_node_net.connect)({ host: this.host, port: this.port, keepAlive: this.keepAlive }, () => {
         let s;
-        this.connection = s = new p(n, this.encoding), n.off("error", e), s.addEventListener("close", () => this.dispatchEvent(new l2())), s.addEventListener("error", (o) => this.dispatchEvent(new r6(o.error))), t(this.connection);
+        this.connection = s = new p2(n, this.encoding), n.off("error", e), s.addEventListener("close", () => this.dispatchEvent(new l())), s.addEventListener("error", (o) => this.dispatchEvent(new r6(o.error))), t(this.connection);
       });
       n.on("error", e);
     });
@@ -43283,7 +43302,7 @@ var u = class {
   }
   start(t, e) {
     let n = import_node_net2.default.createServer((s) => {
-      let o = new p(s, e);
+      let o = new p2(s, e);
       this.handler(o);
     });
     n.listen(t), this.server = n;
@@ -43451,20 +43470,20 @@ var AgentDicomChannel = class extends BaseChannel {
               calledAeTitle: this.association?.getCalledAeTitle()
             },
             dataset: dicomJson,
-            binary: binary ? te(binary) : void 0
+            binary: binary ? re(binary) : void 0
           };
           App.instance.addToWebSocketQueue({
             type: "agent:transmit:request",
             accessToken: "placeholder",
             channel: DcmjsDimseScp.channel.getDefinition().name,
             remote: this.association?.getCallingAeTitle(),
-            contentType: D.JSON,
+            contentType: A.JSON,
             body: JSON.stringify(payload),
             callback: `Agent/${App.instance.agentId}-${(0, import_node_crypto.randomUUID)()}`
           });
           response.setStatus(dimse.constants.Status.Success);
         } catch (err) {
-          DcmjsDimseScp.channel.log.error(`DICOM error: ${Re(err)}`);
+          DcmjsDimseScp.channel.log.error(`DICOM error: ${Ce(err)}`);
           response.setStatus(dimse.constants.Status.ProcessingFailure);
         }
         return response;
@@ -43564,12 +43583,12 @@ var AgentHl7ChannelConnection = class {
         accessToken: "placeholder",
         channel: this.channel.getDefinition().name,
         remote: this.remote,
-        contentType: D.HL7_V2,
+        contentType: A.HL7_V2,
         body: event.message.toString(),
         callback: `Agent/${this.channel.app.agentId}-${(0, import_node_crypto2.randomUUID)()}`
       });
     } catch (err) {
-      this.channel.log.error(`HL7 error: ${Re(err)}`);
+      this.channel.log.error(`HL7 error: ${Ce(err)}`);
     }
   }
   close() {
@@ -43793,7 +43812,7 @@ var App = class _App {
           case "agent:transmit:request":
             if (this.config?.status !== "active") {
               this.sendAgentDisabledError(command);
-            } else if (command.contentType === D.PING) {
+            } else if (command.contentType === A.PING) {
               await this.tryPingHost(command);
             } else {
               this.pushMessage(command);
@@ -43811,7 +43830,7 @@ var App = class _App {
             } catch (err) {
               await this.sendToWebSocket({
                 type: "agent:error",
-                body: Re(err),
+                body: Ce(err),
                 callback: command.callback
               });
             }
@@ -43826,7 +43845,7 @@ var App = class _App {
             this.log.error(`Unknown message type: ${command.type}`);
         }
       } catch (err) {
-        this.log.error(`WebSocket error on incoming message: ${Re(err)}`);
+        this.log.error(`WebSocket error on incoming message: ${Ce(err)}`);
       }
     });
     return new Promise((resolve2, reject) => {
@@ -43901,7 +43920,7 @@ var App = class _App {
       try {
         await this.startOrReloadChannel(definition, endpoint);
       } catch (err) {
-        this.log.error(Re(err));
+        this.log.error(Ce(err));
       }
     }
   }
@@ -43927,7 +43946,7 @@ var App = class _App {
         parsedEndpoint = new URL(endpoint.address);
       } catch (err) {
         throw new Error(
-          `Error while validating endpoint address for channel '${channel.name}': ${Re(err)}`
+          `Error while validating endpoint address for channel '${channel.name}': ${Ce(err)}`
         );
       }
       if (seenPorts.has(parsedEndpoint.port)) {
@@ -44006,7 +44025,7 @@ var App = class _App {
           try {
             await this.sendToWebSocket(msg);
           } catch (err) {
-            this.log.error(`WebSocket error while attempting to send message: ${Re(err)}`);
+            this.log.error(`WebSocket error while attempting to send message: ${Ce(err)}`);
             this.webSocketQueue.unshift(msg);
             throw err;
           }
@@ -44043,7 +44062,7 @@ IPv6 is currently unsupported.`;
         this.log.error(errMsg);
         throw new Error(errMsg);
       }
-      if (!((0, import_node_net3.isIPv4)(message.remote) || ul(message.remote))) {
+      if (!((0, import_node_net3.isIPv4)(message.remote) || ll(message.remote))) {
         const errMsg = `Attempted to ping an invalid host.
 
 "${message.remote}" is not a valid IPv4 address or a resolvable hostname.`;
@@ -44075,22 +44094,22 @@ ${result}`);
       this.addToWebSocketQueue({
         type: "agent:transmit:response",
         channel: message.channel,
-        contentType: D.PING,
+        contentType: A.PING,
         remote: message.remote,
         callback: message.callback,
         statusCode: 200,
         body: result
       });
     } catch (err) {
-      this.log.error(`Error during ping attempt to ${message.remote ?? "NO_HOST_GIVEN"}: ${Re(err)}`);
+      this.log.error(`Error during ping attempt to ${message.remote ?? "NO_HOST_GIVEN"}: ${Ce(err)}`);
       this.addToWebSocketQueue({
         type: "agent:transmit:response",
         channel: message.channel,
-        contentType: D.TEXT,
+        contentType: A.TEXT,
         remote: message.remote,
         callback: message.callback,
         statusCode: 400,
-        body: Re(err)
+        body: Ce(err)
       });
     }
   }
@@ -44106,7 +44125,7 @@ ${result}`);
       return;
     }
     let child;
-    if (message.version && !await Mm("agent-upgrader", message.version)) {
+    if (message.version && !await _m("agent-upgrader", message.version)) {
       const versionTag = message.version ? `v${message.version}` : "latest";
       const errMsg = `Error during upgrading to version '${versionTag}'. '${message.version}' is not a valid version`;
       this.log.error(errMsg);
@@ -44137,11 +44156,11 @@ ${result}`);
         });
       });
       child.on("error", (err) => {
-        this.log.error(Re(err));
+        this.log.error(Ce(err));
       });
     } catch (err) {
       const versionTag = message.version ? `v${message.version}` : "latest";
-      const errMsg = `Error during upgrading to version '${versionTag}': ${Re(err)}`;
+      const errMsg = `Error during upgrading to version '${versionTag}': ${Ce(err)}`;
       this.log.error(errMsg);
       await this.sendToWebSocket({
         type: "agent:error",
@@ -44153,7 +44172,7 @@ ${result}`);
     try {
       await this.stop();
       this.log.info("Successfully stopped agent network services");
-      const targetVersion = message.version ?? await _m("agent-upgrader");
+      const targetVersion = message.version ?? await Nm("agent-upgrader");
       this.log.info("Writing upgrade manifest...", { previousVersion: $r, targetVersion });
       (0, import_node_fs3.writeFileSync)(
         UPGRADE_MANIFEST_PATH,
@@ -44168,7 +44187,7 @@ ${result}`);
       child.disconnect();
     } catch (err) {
       this.log.error(
-        `Error while stopping agent or messaging child process as part of upgrade: ${Re(err)}`
+        `Error while stopping agent or messaging child process as part of upgrade: ${Ce(err)}`
       );
       import_node_process.default.exit(1);
     }
@@ -44233,20 +44252,20 @@ ${result}`);
         channel: message.channel,
         remote: message.remote,
         callback: message.callback,
-        contentType: D.HL7_V2,
+        contentType: A.HL7_V2,
         statusCode: 200,
         body: response.toString()
       });
     }).catch((err) => {
-      this.log.error(`HL7 error: ${Re(err)}`);
+      this.log.error(`HL7 error: ${Ce(err)}`);
       this.addToWebSocketQueue({
         type: "agent:transmit:response",
         channel: message.channel,
         remote: message.remote,
         callback: message.callback,
-        contentType: D.TEXT,
+        contentType: A.TEXT,
         statusCode: 400,
-        body: Re(err)
+        body: Ce(err)
       });
       if (client.keepAlive) {
         this.hl7Clients.delete(message.remote);
@@ -44295,7 +44314,7 @@ async function agentMain(argv) {
   const { baseUrl, clientId, clientSecret, agentId } = args;
   const medplum = new Lt({ baseUrl, clientId });
   await medplum.startClientLogin(clientId, clientSecret);
-  const app = new App(medplum, agentId, vm(args.logLevel ?? "INFO"));
+  const app = new App(medplum, agentId, Tm(args.logLevel ?? "INFO"));
   await app.start();
   process.on("SIGINT", async () => {
     console.log("Gracefully shutting down from SIGINT (Ctrl-C)");
@@ -44336,10 +44355,10 @@ async function upgraderMain(argv) {
     });
   });
   import_node_process2.default.send({ type: "STARTED" });
-  if (argv[3] && !mc(argv[3])) {
+  if (argv[3] && !hc(argv[3])) {
     throw new Error("Invalid version specified");
   }
-  const version = argv[3] ?? await _m("agent-upgrader");
+  const version = argv[3] ?? await Nm("agent-upgrader");
   const binPath = getReleaseBinPath(version);
   if (!(0, import_node_fs5.existsSync)(binPath)) {
     globalLogger.info(`Could not find binary at "${binPath}". Downloading release from GitHub...`);
@@ -44362,7 +44381,7 @@ async function upgraderMain(argv) {
     (0, import_node_child_process2.spawnSync)(binPath, ["/S"]);
     globalLogger.info(`Agent version ${version} successfully installed`);
   } catch (err) {
-    globalLogger.error(`Error while attempting to run installer: ${Re(err)}`);
+    globalLogger.error(`Error while attempting to run installer: ${Ce(err)}`);
     globalLogger.error("Failed to run installer, attempting to restart agent service...");
     try {
       (0, import_node_child_process2.execSync)('net start "Medplum Agent"');