@medplum/agent 5.1.15 → 5.1.17

package/dist/cjs/index.cjs

@@ -3997,6 +3997,18 @@ var require_semver = __commonJS({
     var { safeRe: re2, t } = require_re();
     var parseOptions = require_parse_options();
     var { compareIdentifiers } = require_identifiers();
+    var isPrereleaseIdentifier = (prerelease, identifier) => {
+      const identifiers = identifier.split(".");
+      if (identifiers.length > prerelease.length) {
+        return false;
+      }
+      for (let i = 0; i < identifiers.length; i++) {
+        if (compareIdentifiers(prerelease[i], identifiers[i]) !== 0) {
+          return false;
+        }
+      }
+      return true;
+    };
     var SemVer = class _SemVer {
       constructor(version, options) {
         options = parseOptions(options);
@@ -4243,8 +4255,9 @@ var require_semver = __commonJS({
               if (identifierBase === false) {
                 prerelease = [identifier];
               }
-              if (compareIdentifiers(this.prerelease[0], identifier) === 0) {
-                if (isNaN(this.prerelease[1])) {
+              if (isPrereleaseIdentifier(this.prerelease, identifier)) {
+                const prereleaseBase = this.prerelease[identifier.split(".").length];
+                if (isNaN(prereleaseBase)) {
                   this.prerelease = prerelease;
                 }
               } else {
@@ -4803,8 +4816,8 @@ var require_range = __commonJS({
           return cached;
         }
         const loose = this.options.loose;
-        const hr = loose ? re2[t.HYPHENRANGELOOSE] : re2[t.HYPHENRANGE];
-        range = range.replace(hr, hyphenReplace(this.options.includePrerelease));
+        const hr2 = loose ? re2[t.HYPHENRANGELOOSE] : re2[t.HYPHENRANGE];
+        range = range.replace(hr2, hyphenReplace(this.options.includePrerelease));
         debug("hyphen replace", range);
         range = range.replace(re2[t.COMPARATORTRIM], comparatorTrimReplace);
         debug("comparator trim", range);
@@ -10653,11 +10666,11 @@ var require_dcmjs = __commonJS({
           Promise.resolve(value).then(_next, _throw);
         }
       }
-      function _asyncToGenerator2(fn2) {
+      function _asyncToGenerator2(fn) {
         return function() {
           var self2 = this, args = arguments;
           return new Promise(function(resolve2, reject) {
-            var gen = fn2.apply(self2, args);
+            var gen = fn.apply(self2, args);
             function _next(value) {
               asyncGeneratorStep2(gen, resolve2, reject, _next, _throw, "next", value);
             }
@@ -10733,11 +10746,11 @@ var require_dcmjs = __commonJS({
         };
         return _setPrototypeOf2(o2, p2);
       }
-      function _isNativeFunction(fn2) {
+      function _isNativeFunction(fn) {
         try {
-          return Function.toString.call(fn2).indexOf("[native code]") !== -1;
+          return Function.toString.call(fn).indexOf("[native code]") !== -1;
         } catch (e) {
-          return typeof fn2 === "function";
+          return typeof fn === "function";
         }
       }
       function _wrapNativeSuper(Class) {
@@ -15772,9 +15785,9 @@ var require_dcmjs = __commonJS({
         }, {
           key: "readVR",
           value: function readVR() {
-            var vr = String.fromCharCode(this.view.getUint8(this.offset)) + String.fromCharCode(this.view.getUint8(this.offset + 1));
+            var vr2 = String.fromCharCode(this.view.getUint8(this.offset)) + String.fromCharCode(this.view.getUint8(this.offset + 1));
             this.increment(2);
-            return vr;
+            return vr2;
           }
         }, {
           key: "readEncodedString",
@@ -16785,20 +16798,20 @@ var require_dcmjs = __commonJS({
         }, {
           key: "createByTypeString",
           value: function createByTypeString(type) {
-            var vr = VRinstances2[type];
-            if (vr === void 0) {
+            var vr2 = VRinstances2[type];
+            if (vr2 === void 0) {
               if (type == "ox") {
                 validationLog2.error("Invalid vr type", type, "- using OW");
-                vr = VRinstances2["OW"];
+                vr2 = VRinstances2["OW"];
               } else if (type == "xs") {
                 validationLog2.error("Invalid vr type", type, "- using US");
-                vr = VRinstances2["US"];
+                vr2 = VRinstances2["US"];
               } else {
                 validationLog2.error("Invalid vr type", type, "- using UN");
-                vr = VRinstances2["UN"];
+                vr2 = VRinstances2["UN"];
               }
             }
-            return vr;
+            return vr2;
           }
         }, {
           key: "parseUnknownVr",
@@ -17884,10 +17897,10 @@ var require_dcmjs = __commonJS({
       })(BinaryRepresentation2);
       var ParsedUnknownValue2 = /* @__PURE__ */ (function(_BinaryRepresentation2) {
         _inherits2(ParsedUnknownValue3, _BinaryRepresentation2);
-        function ParsedUnknownValue3(vr) {
+        function ParsedUnknownValue3(vr2) {
           var _this28;
           _classCallCheck2(this, ParsedUnknownValue3);
-          _this28 = _callSuper2(this, ParsedUnknownValue3, [vr]);
+          _this28 = _callSuper2(this, ParsedUnknownValue3, [vr2]);
           _this28.maxLength = null;
           _this28.padByte = 0;
           _this28.noMultiple = true;
@@ -17902,13 +17915,13 @@ var require_dcmjs = __commonJS({
           value: function read(stream, length3, syntax, readOptions) {
             var arrayBuffer = this.readBytes(stream, length3, syntax)[0];
             var streamFromBuffer = new ReadBufferStream2(arrayBuffer, true);
-            var vr = ValueRepresentation2.createByTypeString(this.type);
-            if (vr.isBinary() && length3 > vr.maxLength && !vr.noMultiple) {
+            var vr2 = ValueRepresentation2.createByTypeString(this.type);
+            if (vr2.isBinary() && length3 > vr2.maxLength && !vr2.noMultiple) {
               var values = [];
               var rawValues = [];
-              var times = length3 / vr.maxLength, i = 0;
+              var times = length3 / vr2.maxLength, i = 0;
               while (i++ < times) {
-                var _vr$read = vr.read(streamFromBuffer, vr.maxLength, syntax, readOptions), rawValue = _vr$read.rawValue, value = _vr$read.value;
+                var _vr$read = vr2.read(streamFromBuffer, vr2.maxLength, syntax, readOptions), rawValue = _vr$read.rawValue, value = _vr$read.value;
                 rawValues.push(rawValue);
                 values.push(value);
               }
@@ -17917,7 +17930,7 @@ var require_dcmjs = __commonJS({
                 value: values
               };
             } else {
-              return vr.read(streamFromBuffer, length3, syntax, readOptions);
+              return vr2.read(streamFromBuffer, length3, syntax, readOptions);
             }
           }
         }]);
@@ -18017,12 +18030,12 @@ var require_dcmjs = __commonJS({
         }
         _createClass2(DicomDict3, [{
           key: "upsertTag",
-          value: function upsertTag(tag, vr, values) {
+          value: function upsertTag(tag, vr2, values) {
             if (this.dict[tag]) {
               this.dict[tag].Value = values;
             } else {
               this.dict[tag] = ValueRepresentation2.addTagAccessors({
-                vr
+                vr: vr2
               });
               this.dict[tag].Value = values;
             }
@@ -18637,13 +18650,13 @@ var require_dcmjs = __commonJS({
         var end = gi2 + 1 < groupStart.length ? groupStart[gi2 + 1] : elems.length;
         var ei2 = _binSearchU162(elems, start, end, elem);
         if (ei2 < 0) return void 0;
-        var vr = vrTable$12[vrCode[ei2]];
+        var vr2 = vrTable$12[vrCode[ei2]];
         var vm = vmTable$12[vmCode[ei2]];
         var off = nameOff[ei2];
         var len3 = nameLen[ei2];
         var name = nameBlob$12.slice(off, off + len3);
         return {
-          vr,
+          vr: vr2,
           vm,
           name
         };
@@ -18680,14 +18693,14 @@ var require_dcmjs = __commonJS({
             var elem = elems[ei2];
             var eHex = _pad42(elem.toString(16).toUpperCase());
             var tag = "(" + gHex + "," + eHex + ")";
-            var vr = vrTable$12[vrCode[ei2]];
+            var vr2 = vrTable$12[vrCode[ei2]];
             var vm = vmTable$12[vmCode[ei2]];
             var off = nameOff[ei2];
             var len3 = nameLen[ei2];
             var name = nameBlob$12.slice(off, off + len3);
             out.push({
               tag,
-              vr,
+              vr: vr2,
               vm,
               name
             });
@@ -19011,9 +19024,9 @@ var require_dcmjs = __commonJS({
                 if (dataValue === void 0) {
                   return;
                 }
-                var vr = dataset._vrMap && dataset._vrMap[naturalName] ? dataset._vrMap[naturalName] : entry.vr;
+                var vr2 = dataset._vrMap && dataset._vrMap[naturalName] ? dataset._vrMap[naturalName] : entry.vr;
                 var dataItem = ValueRepresentation2.addTagAccessors({
-                  vr
+                  vr: vr2
                 });
                 dataItem.Value = dataset[naturalName];
                 if (dataValue !== null) {
@@ -19267,7 +19280,7 @@ var require_dcmjs = __commonJS({
         }, {
           key: "write",
           value: function write(stream, vrType, values, syntax, writeOptions) {
-            var vr = ValueRepresentation2.createByTypeString(vrType);
+            var vr2 = ValueRepresentation2.createByTypeString(vrType);
             var useSyntax = DicomMessage$12._normalizeSyntax(syntax);
             var implicit = useSyntax === IMPLICIT_LITTLE_ENDIAN2;
             var isLittleEndian = useSyntax === IMPLICIT_LITTLE_ENDIAN2 || useSyntax === EXPLICIT_LITTLE_ENDIAN$12;
@@ -19279,11 +19292,11 @@ var require_dcmjs = __commonJS({
             var tagStream = new WriteBufferStream2(256), valueLength;
             tagStream.setEndian(isLittleEndian);
             if (vrType == "OW" || vrType == "OB" || vrType == "UN") {
-              valueLength = vr.writeBytes(tagStream, values, useSyntax, isEncapsulated, writeOptions);
+              valueLength = vr2.writeBytes(tagStream, values, useSyntax, isEncapsulated, writeOptions);
             } else if (vrType == "SQ") {
-              valueLength = vr.writeBytes(tagStream, values, useSyntax, writeOptions);
+              valueLength = vr2.writeBytes(tagStream, values, useSyntax, writeOptions);
             } else {
-              valueLength = vr.writeBytes(tagStream, values, writeOptions);
+              valueLength = vr2.writeBytes(tagStream, values, writeOptions);
             }
             if (vrType == "SQ") {
               valueLength = UNDEFINED_LENGTH2;
@@ -19293,14 +19306,14 @@ var require_dcmjs = __commonJS({
               stream.writeUint32(valueLength);
               written += 4;
             } else {
-              var isBig16Length = !vr.isLength32() && valueLength >= 65536 && valueLength !== UNDEFINED_LENGTH2;
-              if (vr.isLength32() || isBig16Length) {
-                stream.writeAsciiString(isBig16Length ? "UN" : vr.type);
+              var isBig16Length = !vr2.isLength32() && valueLength >= 65536 && valueLength !== UNDEFINED_LENGTH2;
+              if (vr2.isLength32() || isBig16Length) {
+                stream.writeAsciiString(isBig16Length ? "UN" : vr2.type);
                 stream.writeUint16(0);
                 stream.writeUint32(valueLength);
                 written += 8;
               } else {
-                stream.writeAsciiString(vr.type);
+                stream.writeAsciiString(vr2.type);
                 stream.writeUint16(valueLength);
                 written += 4;
               }
@@ -19535,9 +19548,9 @@ var require_dcmjs = __commonJS({
           }
         }, {
           key: "writeTagObject",
-          value: function writeTagObject(stream, tagString, vr, values, syntax, writeOptions) {
+          value: function writeTagObject(stream, tagString, vr2, values, syntax, writeOptions) {
             var tag = Tag2.fromString(tagString);
-            tag.write(stream, vr, values, syntax, writeOptions);
+            tag.write(stream, vr2, values, syntax, writeOptions);
           }
         }, {
           key: "write",
@@ -19557,14 +19570,14 @@ var require_dcmjs = __commonJS({
             if (!tagObject._rawValue) {
               return tagObject.Value;
             }
-            var vr = ValueRepresentation2.createByTypeString(vrType);
+            var vr2 = ValueRepresentation2.createByTypeString(vrType);
             var originalValue;
             if (Array.isArray(tagObject._rawValue)) {
               originalValue = tagObject._rawValue.map(function(val) {
-                return vr.applyFormatting(val);
+                return vr2.applyFormatting(val);
               });
             } else {
-              originalValue = vr.applyFormatting(tagObject._rawValue);
+              originalValue = vr2.applyFormatting(tagObject._rawValue);
             }
             if (deepEqual2(tagObject.Value, originalValue)) {
               return tagObject._rawValue;
@@ -19593,7 +19606,7 @@ var require_dcmjs = __commonJS({
                 };
               }
             }
-            var length3 = null, vr = null, vrType;
+            var length3 = null, vr2 = null, vrType;
             if (implicit) {
               length3 = stream.readUint32();
               var elementData = DicomMessage3.lookupTag(tag);
@@ -19612,16 +19625,16 @@ var require_dcmjs = __commonJS({
                   vrType = "UN";
                 }
               }
-              vr = ValueRepresentation2.createByTypeString(vrType);
+              vr2 = ValueRepresentation2.createByTypeString(vrType);
             } else {
               vrType = stream.readVR();
               if (vrType === "UN" && DicomMessage3.lookupTag(tag) && DicomMessage3.lookupTag(tag).vr) {
                 vrType = DicomMessage3.lookupTag(tag).vr;
-                vr = ValueRepresentation2.parseUnknownVr(vrType);
+                vr2 = ValueRepresentation2.parseUnknownVr(vrType);
               } else {
-                vr = ValueRepresentation2.createByTypeString(vrType);
+                vr2 = ValueRepresentation2.createByTypeString(vrType);
               }
-              if (vr.isLength32()) {
+              if (vr2.isLength32()) {
                 stream.increment(2);
                 length3 = stream.readUint32();
               } else {
@@ -19630,27 +19643,27 @@ var require_dcmjs = __commonJS({
             }
             var values = [];
             var rawValues = [];
-            if (vr.isBinary() && length3 > vr.maxLength && !vr.noMultiple) {
-              var times = length3 / vr.maxLength, i = 0;
+            if (vr2.isBinary() && length3 > vr2.maxLength && !vr2.noMultiple) {
+              var times = length3 / vr2.maxLength, i = 0;
               while (i++ < times) {
-                var _vr$read = vr.read(stream, vr.maxLength, syntax, options), rawValue = _vr$read.rawValue, value = _vr$read.value;
+                var _vr$read = vr2.read(stream, vr2.maxLength, syntax, options), rawValue = _vr$read.rawValue, value = _vr$read.value;
                 rawValues.push(rawValue);
                 values.push(value);
               }
             } else {
-              var _ref = vr.read(stream, length3, syntax, options) || {}, _rawValue = _ref.rawValue, _value2 = _ref.value;
-              if (!vr.isBinary() && singleVRs2.indexOf(vr.type) == -1) {
+              var _ref = vr2.read(stream, length3, syntax, options) || {}, _rawValue = _ref.rawValue, _value2 = _ref.value;
+              if (!vr2.isBinary() && singleVRs2.indexOf(vr2.type) == -1) {
                 rawValues = _rawValue;
                 values = _value2;
                 if (typeof _value2 === "string") {
                   var delimiterChar = String.fromCharCode(VM_DELIMITER2);
-                  rawValues = vr.dropPadByte(_rawValue.split(delimiterChar));
-                  values = vr.dropPadByte(_value2.split(delimiterChar));
+                  rawValues = vr2.dropPadByte(_rawValue.split(delimiterChar));
+                  values = vr2.dropPadByte(_value2.split(delimiterChar));
                 }
-              } else if (vr.type == "SQ") {
+              } else if (vr2.type == "SQ") {
                 rawValues = _rawValue;
                 values = _value2;
-              } else if (vr.type == "OW" || vr.type == "OB") {
+              } else if (vr2.type == "OW" || vr2.type == "OB") {
                 rawValues = _rawValue;
                 values = _value2;
               } else {
@@ -19661,7 +19674,7 @@ var require_dcmjs = __commonJS({
             stream.setEndian(oldEndian);
             var retObj = ValueRepresentation2.addTagAccessors({
               tag,
-              vr
+              vr: vr2
             });
             retObj.values = values;
             retObj.rawValues = rawValues;
@@ -19732,13 +19745,13 @@ var require_dcmjs = __commonJS({
           if (keyStr < candidate) hi2 = mid - 1;
           else if (keyStr > candidate) lo = mid + 1;
           else {
-            var vr = vrTable2[vrCode[mid]];
+            var vr2 = vrTable2[vrCode[mid]];
             var vm = vmTable2[vmCode[mid]];
             var off = nameOff[mid];
             var nlen = nameLen[mid];
             var name = nameBlob2.slice(off, off + nlen);
             return {
-              vr,
+              vr: vr2,
               vm,
               name
             };
@@ -20084,8 +20097,8 @@ var require_dcmjs = __commonJS({
              *
              * @param {(() => Promise<void>) | null} fn - Function that returns a Promise, or null to clear
              */
-            function setDrain(fn2) {
-              this._drain = typeof fn2 === "function" ? fn2 : null;
+            function setDrain(fn) {
+              this._drain = typeof fn === "function" ? fn : null;
             }
           )
           /**
@@ -21078,8 +21091,8 @@ var require_dcmjs = __commonJS({
         }, {
           key: "isSequence",
           value: function isSequence(tagInfo) {
-            var vr = tagInfo.vr, length3 = tagInfo.length;
-            return vr === "SQ" || vr === "UN" && length3 === UNDEFINED_LENGTH_FIX2;
+            var vr2 = tagInfo.vr, length3 = tagInfo.length;
+            return vr2 === "SQ" || vr2 === "UN" && length3 === UNDEFINED_LENGTH_FIX2;
           }
           /**
            * Reads a tag header.
@@ -21110,12 +21123,12 @@ var require_dcmjs = __commonJS({
               }
             }
             var length3 = null;
-            var vr = null;
+            var vr2 = null;
             var vrType;
             var isCommand = tagObj.group() === 0;
             if (tagObj.isInstruction()) {
               length3 = stream.readUint32();
-              vr = ValueRepresentation2.createByTypeString("UN");
+              vr2 = ValueRepresentation2.createByTypeString("UN");
             } else if (implicit && !isCommand) {
               length3 = stream.readUint32();
               var elementData = DicomMessage2.lookupTag(tagObj);
@@ -21136,17 +21149,17 @@ var require_dcmjs = __commonJS({
                   vrType = "UN";
                 }
               }
-              vr = ValueRepresentation2.createByTypeString(vrType);
+              vr2 = ValueRepresentation2.createByTypeString(vrType);
             } else {
               var _DicomMessage$lookupT;
               vrType = stream.readVR();
               if (vrType === "UN" && (_DicomMessage$lookupT = DicomMessage2.lookupTag(tagObj)) !== null && _DicomMessage$lookupT !== void 0 && _DicomMessage$lookupT.vr) {
                 vrType = DicomMessage2.lookupTag(tagObj).vr;
-                vr = ValueRepresentation2.parseUnknownVr(vrType);
+                vr2 = ValueRepresentation2.parseUnknownVr(vrType);
               } else {
-                vr = ValueRepresentation2.createByTypeString(vrType);
+                vr2 = ValueRepresentation2.createByTypeString(vrType);
               }
-              if (vr.isLength32()) {
+              if (vr2.isLength32()) {
                 stream.increment(2);
                 length3 = stream.readUint32();
               } else {
@@ -21156,8 +21169,8 @@ var require_dcmjs = __commonJS({
             var punctuatedTag = DicomMetaDictionary2.punctuateTag(tag);
             var entry = DicomMetaDictionary2.dictionary[punctuatedTag];
             var header = {
-              vrObj: vr,
-              vr: vr.type,
+              vrObj: vr2,
+              vr: vr2.type,
               tag,
               tagObj,
               vm: entry === null || entry === void 0 ? void 0 : entry.vm,
@@ -21176,7 +21189,7 @@ var require_dcmjs = __commonJS({
           key: "readSingle",
           value: (function() {
             var _readSingle = _asyncToGenerator2(/* @__PURE__ */ _regeneratorRuntime2().mark(function _callee11(tagInfo, listener, options) {
-              var length3, stream, syntax, vr, values, times, i, _vr$read, value, _vr$read2, _value2, delimiterChar, _values, _values2, coding2;
+              var length3, stream, syntax, vr2, values, times, i, _vr$read, value, _vr$read2, _value2, delimiterChar, _values, _values2, coding2;
               return _regeneratorRuntime2().wrap(function _callee11$(_context11) {
                 while (1) switch (_context11.prev = _context11.next) {
                   case 0:
@@ -21185,25 +21198,25 @@ var require_dcmjs = __commonJS({
                     _context11.next = 4;
                     return this.stream.ensureAvailable(length3);
                   case 4:
-                    vr = ValueRepresentation2.createByTypeString(tagInfo.vr);
+                    vr2 = ValueRepresentation2.createByTypeString(tagInfo.vr);
                     values = [];
-                    if (vr.isBinary() && length3 > vr.maxLength && !vr.noMultiple) {
-                      times = length3 / vr.maxLength;
+                    if (vr2.isBinary() && length3 > vr2.maxLength && !vr2.noMultiple) {
+                      times = length3 / vr2.maxLength;
                       i = 0;
                       while (i++ < times) {
                         readLog2.trace("readSingle multi-value loop", i, times);
-                        _vr$read = vr.read(stream, vr.maxLength, syntax), value = _vr$read.value;
+                        _vr$read = vr2.read(stream, vr2.maxLength, syntax), value = _vr$read.value;
                         values.push(value);
                       }
                     } else {
-                      _value2 = (_vr$read2 = vr.read(stream, length3, syntax)) === null || _vr$read2 === void 0 ? void 0 : _vr$read2.value;
-                      if (!vr.isBinary() && singleVRs2.indexOf(vr.type) == -1) {
+                      _value2 = (_vr$read2 = vr2.read(stream, length3, syntax)) === null || _vr$read2 === void 0 ? void 0 : _vr$read2.value;
+                      if (!vr2.isBinary() && singleVRs2.indexOf(vr2.type) == -1) {
                         values = _value2;
                         if (typeof _value2 === "string") {
                           delimiterChar = String.fromCharCode(VM_DELIMITER2);
-                          values = vr.dropPadByte(_value2.split(delimiterChar));
+                          values = vr2.dropPadByte(_value2.split(delimiterChar));
                         }
-                      } else if (vr.type == "OW" || vr.type == "OB") {
+                      } else if (vr2.type == "OW" || vr2.type == "OB") {
                         values = _value2;
                       } else {
                         Array.isArray(_value2) ? values = _value2 : values.push(_value2);
@@ -27232,7 +27245,7 @@ var require_dcmjs = __commonJS({
       var sqrLen2 = squaredLength2;
       var forEach2 = (function() {
         var vec = create2();
-        return function(a, stride, offset, count, fn2, arg) {
+        return function(a, stride, offset, count, fn, arg) {
           var i, l;
           if (!stride) {
             stride = 3;
@@ -27249,7 +27262,7 @@ var require_dcmjs = __commonJS({
             vec[0] = a[i];
             vec[1] = a[i + 1];
             vec[2] = a[i + 2];
-            fn2(vec, vec, arg);
+            fn(vec, vec, arg);
             a[i] = vec[0];
             a[i + 1] = vec[1];
             a[i + 2] = vec[2];
@@ -34541,11 +34554,11 @@ var require_decorator = __commonJS({
       };
     };
     var mergeDecorators = (d1, d2) => {
-      var _a, _b, _c, _d, _e, _f;
+      var _a, _b, _c, _d, _e2, _f;
       return {
         class: (0, util_1.unique)([...(_a = d1 === null || d1 === void 0 ? void 0 : d1.class) !== null && _a !== void 0 ? _a : [], ...(_b = d2 === null || d2 === void 0 ? void 0 : d2.class) !== null && _b !== void 0 ? _b : []]),
         static: mergePropertyAndMethodDecorators((_c = d1 === null || d1 === void 0 ? void 0 : d1.static) !== null && _c !== void 0 ? _c : {}, (_d = d2 === null || d2 === void 0 ? void 0 : d2.static) !== null && _d !== void 0 ? _d : {}),
-        instance: mergePropertyAndMethodDecorators((_e = d1 === null || d1 === void 0 ? void 0 : d1.instance) !== null && _e !== void 0 ? _e : {}, (_f = d2 === null || d2 === void 0 ? void 0 : d2.instance) !== null && _f !== void 0 ? _f : {})
+        instance: mergePropertyAndMethodDecorators((_e2 = d1 === null || d1 === void 0 ? void 0 : d1.instance) !== null && _e2 !== void 0 ? _e2 : {}, (_f = d2 === null || d2 === void 0 ? void 0 : d2.instance) !== null && _f !== void 0 ? _f : {})
       };
     };
     var decorators = /* @__PURE__ */ new Map();
@@ -40693,11 +40706,11 @@ var require_from = __commonJS({
         Promise.resolve(value).then(_next, _throw);
       }
     }
-    function _asyncToGenerator2(fn2) {
+    function _asyncToGenerator2(fn) {
       return function() {
         var self2 = this, args = arguments;
         return new Promise(function(resolve2, reject) {
-          var gen = fn2.apply(self2, args);
+          var gen = fn.apply(self2, args);
           function _next(value) {
             asyncGeneratorStep2(gen, resolve2, reject, _next, _throw, "next", value);
           }
@@ -40840,11 +40853,11 @@ var require_stream_readable = __commonJS({
     require_inherits()(Readable2, Stream);
     var errorOrDestroy = destroyImpl.errorOrDestroy;
     var kProxyEvents = ["error", "close", "destroy", "pause", "resume"];
-    function prependListener(emitter, event, fn2) {
-      if (typeof emitter.prependListener === "function") return emitter.prependListener(event, fn2);
-      if (!emitter._events || !emitter._events[event]) emitter.on(event, fn2);
-      else if (Array.isArray(emitter._events[event])) emitter._events[event].unshift(fn2);
-      else emitter._events[event] = [fn2, emitter._events[event]];
+    function prependListener(emitter, event, fn) {
+      if (typeof emitter.prependListener === "function") return emitter.prependListener(event, fn);
+      if (!emitter._events || !emitter._events[event]) emitter.on(event, fn);
+      else if (Array.isArray(emitter._events[event])) emitter._events[event].unshift(fn);
+      else emitter._events[event] = [fn, emitter._events[event]];
     }
     function ReadableState(options, stream, isDuplex) {
       Duplex = Duplex || require_stream_duplex();
@@ -41292,8 +41305,8 @@ var require_stream_readable = __commonJS({
       dest.emit("unpipe", this, unpipeInfo);
       return this;
     };
-    Readable2.prototype.on = function(ev, fn2) {
-      var res = Stream.prototype.on.call(this, ev, fn2);
+    Readable2.prototype.on = function(ev, fn) {
+      var res = Stream.prototype.on.call(this, ev, fn);
       var state = this._readableState;
       if (ev === "data") {
         state.readableListening = this.listenerCount("readable") > 0;
@@ -41314,8 +41327,8 @@ var require_stream_readable = __commonJS({
       return res;
     };
     Readable2.prototype.addListener = Readable2.prototype.on;
-    Readable2.prototype.removeListener = function(ev, fn2) {
-      var res = Stream.prototype.removeListener.call(this, ev, fn2);
+    Readable2.prototype.removeListener = function(ev, fn) {
+      var res = Stream.prototype.removeListener.call(this, ev, fn);
       if (ev === "readable") {
         process.nextTick(updateReadableListening, this);
       }
@@ -42391,10 +42404,10 @@ var require_initialParams = __commonJS({
     Object.defineProperty(exports2, "__esModule", {
       value: true
     });
-    exports2.default = function(fn2) {
+    exports2.default = function(fn) {
       return function(...args) {
         var callback = args.pop();
-        return fn2.call(this, args, callback);
+        return fn.call(this, args, callback);
       };
     };
     module2.exports = exports2.default;
@@ -42413,11 +42426,11 @@ var require_setImmediate = __commonJS({
     var hasQueueMicrotask = exports2.hasQueueMicrotask = typeof queueMicrotask === "function" && queueMicrotask;
     var hasSetImmediate = exports2.hasSetImmediate = typeof setImmediate === "function" && setImmediate;
     var hasNextTick = exports2.hasNextTick = typeof process === "object" && typeof process.nextTick === "function";
-    function fallback(fn2) {
-      setTimeout(fn2, 0);
+    function fallback(fn) {
+      setTimeout(fn, 0);
     }
     function wrap(defer) {
-      return (fn2, ...args) => defer(() => fn2(...args));
+      return (fn, ...args) => defer(() => fn(...args));
     }
     var _defer;
     if (hasQueueMicrotask) {
@@ -42504,11 +42517,11 @@ var require_wrapAsync = __commonJS({
     function _interopRequireDefault(obj) {
       return obj && obj.__esModule ? obj : { default: obj };
     }
-    function isAsync(fn2) {
-      return fn2[Symbol.toStringTag] === "AsyncFunction";
+    function isAsync(fn) {
+      return fn[Symbol.toStringTag] === "AsyncFunction";
     }
-    function isAsyncGenerator(fn2) {
-      return fn2[Symbol.toStringTag] === "AsyncGenerator";
+    function isAsyncGenerator(fn) {
+      return fn[Symbol.toStringTag] === "AsyncGenerator";
     }
     function isAsyncIterable(obj) {
       return typeof obj[Symbol.asyncIterator] === "function";
@@ -42593,14 +42606,14 @@ var require_once = __commonJS({
       value: true
     });
     exports2.default = once;
-    function once(fn2) {
+    function once(fn) {
       function wrapper(...args) {
-        if (fn2 === null) return;
-        var callFn = fn2;
-        fn2 = null;
+        if (fn === null) return;
+        var callFn = fn;
+        fn = null;
         callFn.apply(this, args);
       }
-      Object.assign(wrapper, fn2);
+      Object.assign(wrapper, fn);
       return wrapper;
     }
     module2.exports = exports2.default;
@@ -42683,11 +42696,11 @@ var require_onlyOnce = __commonJS({
       value: true
     });
     exports2.default = onlyOnce;
-    function onlyOnce(fn2) {
+    function onlyOnce(fn) {
       return function(...args) {
-        if (fn2 === null) throw new Error("Callback was already called.");
-        var callFn = fn2;
-        fn2 = null;
+        if (fn === null) throw new Error("Callback was already called.");
+        var callFn = fn;
+        fn = null;
         callFn.apply(this, args);
       };
     }
@@ -43086,8 +43099,8 @@ var require_pipeline = __commonJS({
         callback(err2 || new ERR_STREAM_DESTROYED("pipe"));
       };
     }
-    function call(fn2) {
-      fn2();
+    function call(fn) {
+      fn();
     }
     function pipe(from, to2) {
       return from.pipe(to2);
@@ -43175,17 +43188,17 @@ var require_diagnostics = __commonJS({
       if (!async.length) return false;
       return new Promise(function pinky(resolve2) {
         Promise.all(
-          async.map(function prebind(fn2) {
-            return fn2(namespace);
+          async.map(function prebind(fn) {
+            return fn(namespace);
           })
         ).then(function resolved(values) {
           resolve2(values.some(Boolean));
         });
       });
     }
-    function modify(fn2) {
-      if (~modifiers.indexOf(fn2)) return false;
-      modifiers.push(fn2);
+    function modify(fn) {
+      if (~modifiers.indexOf(fn)) return false;
+      modifiers.push(fn);
       return true;
     }
     function write() {
@@ -43197,14 +43210,14 @@ var require_diagnostics = __commonJS({
       }
       return message;
     }
-    function introduce(fn2, options) {
+    function introduce(fn, options) {
       var has2 = Object.prototype.hasOwnProperty;
       for (var key in options) {
         if (has2.call(options, key)) {
-          fn2[key] = options[key];
+          fn[key] = options[key];
         }
       }
-      return fn2;
+      return fn;
     }
     function nope(options) {
       options.enabled = false;
@@ -44056,8 +44069,8 @@ var require_index_cjs = __commonJS({
       const a = lab[1];
       const b3 = lab[2];
       let h2;
-      const hr = Math.atan2(b3, a);
-      h2 = hr * 360 / 2 / Math.PI;
+      const hr2 = Math.atan2(b3, a);
+      h2 = hr2 * 360 / 2 / Math.PI;
       if (h2 < 0) {
         h2 += 360;
       }
@@ -44068,9 +44081,9 @@ var require_index_cjs = __commonJS({
       const l = lch[0];
       const c2 = lch[1];
       const h2 = lch[2];
-      const hr = h2 / 360 * 2 * Math.PI;
-      const a = c2 * Math.cos(hr);
-      const b3 = c2 * Math.sin(hr);
+      const hr2 = h2 / 360 * 2 * Math.PI;
+      const a = c2 * Math.cos(hr2);
+      const b3 = c2 * Math.sin(hr2);
       return [l, a, b3];
     };
     convert$1.rgb.ansi16 = function(args, saturation = null) {
@@ -44362,15 +44375,15 @@ var require_index_cjs = __commonJS({
     }
     function wrapConversion(toModel, graph) {
       const path4 = [graph[toModel].parent, toModel];
-      let fn2 = convert$1[graph[toModel].parent][toModel];
+      let fn = convert$1[graph[toModel].parent][toModel];
       let cur = graph[toModel].parent;
       while (graph[cur].parent) {
         path4.unshift(graph[cur].parent);
-        fn2 = link(convert$1[graph[cur].parent][cur], fn2);
+        fn = link(convert$1[graph[cur].parent][cur], fn);
         cur = graph[cur].parent;
       }
-      fn2.conversion = path4;
-      return fn2;
+      fn.conversion = path4;
+      return fn;
     }
     function route(fromModel) {
       const graph = deriveBFS(fromModel);
@@ -44388,7 +44401,7 @@ var require_index_cjs = __commonJS({
     }
     var convert = {};
     var models = Object.keys(convert$1);
-    function wrapRaw(fn2) {
+    function wrapRaw(fn) {
       const wrappedFn = function(...args) {
         const arg0 = args[0];
         if (arg0 === void 0 || arg0 === null) {
@@ -44397,14 +44410,14 @@ var require_index_cjs = __commonJS({
         if (arg0.length > 1) {
           args = arg0;
         }
-        return fn2(args);
+        return fn(args);
       };
-      if ("conversion" in fn2) {
-        wrappedFn.conversion = fn2.conversion;
+      if ("conversion" in fn) {
+        wrappedFn.conversion = fn.conversion;
       }
       return wrappedFn;
     }
-    function wrapRounded(fn2) {
+    function wrapRounded(fn) {
       const wrappedFn = function(...args) {
         const arg0 = args[0];
         if (arg0 === void 0 || arg0 === null) {
@@ -44413,7 +44426,7 @@ var require_index_cjs = __commonJS({
         if (arg0.length > 1) {
           args = arg0;
         }
-        const result = fn2(args);
+        const result = fn(args);
         if (typeof result === "object") {
           for (let { length: length2 } = result, i = 0; i < length2; i++) {
             result[i] = Math.round(result[i]);
@@ -44421,8 +44434,8 @@ var require_index_cjs = __commonJS({
         }
         return result;
       };
-      if ("conversion" in fn2) {
-        wrappedFn.conversion = fn2.conversion;
+      if ("conversion" in fn) {
+        wrappedFn.conversion = fn.conversion;
       }
       return wrappedFn;
     }
@@ -44433,9 +44446,9 @@ var require_index_cjs = __commonJS({
       const routes = route(fromModel);
       const routeModels = Object.keys(routes);
       for (const toModel of routeModels) {
-        const fn2 = routes[toModel];
-        convert[fromModel][toModel] = wrapRounded(fn2);
-        convert[fromModel][toModel].raw = wrapRaw(fn2);
+        const fn = routes[toModel];
+        convert[fromModel][toModel] = wrapRounded(fn);
+        convert[fromModel][toModel].raw = wrapRaw(fn);
       }
     }
     var skippedModels = [
@@ -44929,10 +44942,10 @@ var require_adapters = __commonJS({
   "../../node_modules/@dabh/diagnostics/adapters/index.js"(exports2, module2) {
     "use strict";
     var enabled = require_enabled();
-    module2.exports = function create2(fn2) {
+    module2.exports = function create2(fn) {
       return function adapter(namespace) {
         try {
-          return enabled(namespace, fn2());
+          return enabled(namespace, fn());
         } catch (e) {
         }
         return false;
@@ -46143,14 +46156,14 @@ var require_fn = __commonJS({
   "../../node_modules/fn.name/index.js"(exports2, module2) {
     "use strict";
     var toString2 = Object.prototype.toString;
-    module2.exports = function name(fn2) {
-      if ("string" === typeof fn2.displayName && fn2.constructor.name) {
-        return fn2.displayName;
-      } else if ("string" === typeof fn2.name && fn2.name) {
-        return fn2.name;
-      }
-      if ("object" === typeof fn2 && fn2.constructor && "string" === typeof fn2.constructor.name) return fn2.constructor.name;
-      var named = fn2.toString(), type = toString2.call(fn2).slice(8, -1);
+    module2.exports = function name(fn) {
+      if ("string" === typeof fn.displayName && fn.constructor.name) {
+        return fn.displayName;
+      } else if ("string" === typeof fn.name && fn.name) {
+        return fn.name;
+      }
+      if ("object" === typeof fn && fn.constructor && "string" === typeof fn.constructor.name) return fn.constructor.name;
+      var named = fn.toString(), type = toString2.call(fn).slice(8, -1);
       if ("Function" === type) {
         named = named.substring(named.indexOf("(") + 1, named.indexOf(")"));
       } else {
@@ -46166,16 +46179,16 @@ var require_one_time = __commonJS({
   "../../node_modules/one-time/index.js"(exports2, module2) {
     "use strict";
     var name = require_fn();
-    module2.exports = function one(fn2) {
+    module2.exports = function one(fn) {
       var called = 0, value;
       function onetime() {
         if (called) return value;
         called = 1;
-        value = fn2.apply(this, arguments);
-        fn2 = null;
+        value = fn.apply(this, arguments);
+        fn = null;
         return value;
       }
-      onetime.displayName = name(fn2);
+      onetime.displayName = name(fn);
       return onetime;
     };
   }
@@ -47815,18 +47828,18 @@ var require_object_hash = __commonJS({
           write("string:" + string.length + ":");
           write(string.toString());
         },
-        _function: function(fn2) {
+        _function: function(fn) {
           write("fn:");
-          if (isNativeFunction(fn2)) {
+          if (isNativeFunction(fn)) {
             this.dispatch("[native]");
           } else {
-            this.dispatch(fn2.toString());
+            this.dispatch(fn.toString());
           }
           if (options.respectFunctionNames !== false) {
-            this.dispatch("function-name:" + String(fn2.name));
+            this.dispatch("function-name:" + String(fn.name));
           }
           if (options.respectFunctionProperties) {
-            this._object(fn2);
+            this._object(fn);
           }
         },
         _number: function(number) {
@@ -48030,10 +48043,10 @@ var require_moment = __commonJS({
       function isDate(input) {
         return input instanceof Date || Object.prototype.toString.call(input) === "[object Date]";
       }
-      function map(arr, fn2) {
+      function map(arr, fn) {
         var res = [], i, arrLen = arr.length;
         for (i = 0; i < arrLen; ++i) {
-          res.push(fn2(arr[i], i));
+          res.push(fn(arr[i], i));
         }
         return res;
       }
@@ -48186,7 +48199,7 @@ var require_moment = __commonJS({
           console.warn("Deprecation warning: " + msg);
         }
       }
-      function deprecate(msg, fn2) {
+      function deprecate(msg, fn) {
         var firstTime = true;
         return extend(function() {
           if (hooks.deprecationHandler != null) {
@@ -48214,8 +48227,8 @@ var require_moment = __commonJS({
             );
             firstTime = false;
           }
-          return fn2.apply(this, arguments);
-        }, fn2);
+          return fn.apply(this, arguments);
+        }, fn);
       }
       var deprecations = {};
       function deprecateSimple(name, msg) {
@@ -50182,7 +50195,7 @@ var require_moment = __commonJS({
           }
         }
       );
-      function pickBy(fn2, moments) {
+      function pickBy(fn, moments) {
         var res, i;
         if (moments.length === 1 && isArray(moments[0])) {
           moments = moments[0];
@@ -50192,7 +50205,7 @@ var require_moment = __commonJS({
         }
         res = moments[0];
         for (i = 1; i < moments.length; ++i) {
-          if (!moments[i].isValid() || moments[i][fn2](res)) {
+          if (!moments[i].isValid() || moments[i][fn](res)) {
             res = moments[i];
           }
         }
@@ -52831,10 +52844,10 @@ var pt = class {
     }, precedence: t });
   }
   construct(e) {
-    return new mr(e, this.prefixParselets, this.infixParselets);
+    return new fr(e, this.prefixParselets, this.infixParselets);
   }
 };
-var mr = class {
+var fr = class {
   constructor(e, t, n) {
     c(this, "tokens");
     c(this, "prefixParselets");
@@ -52891,28 +52904,28 @@ function oe(r6) {
 var ft = "http://hl7.org";
 var mt = "ok";
 var ht = "created";
-var gr = "not-modified";
-var xr = "not-found";
-var Tr = "unauthorized";
+var hr = "not-modified";
+var yr = "not-found";
+var vr = "unauthorized";
 var gt = "accepted";
-var Fn = { resourceType: "OperationOutcome", id: xr, issue: [{ severity: "error", code: "not-found", details: { text: "Not found" } }] };
-var Le = { resourceType: "OperationOutcome", id: Tr, issue: [{ severity: "error", code: "login", details: { text: "Unauthorized" } }] };
-var Un = { ...Le, issue: [...Le.issue, { severity: "error", code: "expired", details: { text: "Token expired" } }] };
-var Sr = { ...Le, issue: [...Le.issue, { severity: "error", code: "invalid", details: { text: "Token not issued for this audience" } }] };
+var Fn = { resourceType: "OperationOutcome", id: yr, issue: [{ severity: "error", code: "not-found", details: { text: "Not found" } }] };
+var Ne = { resourceType: "OperationOutcome", id: vr, issue: [{ severity: "error", code: "login", details: { text: "Unauthorized" } }] };
+var Un = { ...Ne, issue: [...Ne.issue, { severity: "error", code: "expired", details: { text: "Token expired" } }] };
+var Tr = { ...Ne, issue: [...Ne.issue, { severity: "error", code: "invalid", details: { text: "Token not issued for this audience" } }] };
 function P(r6, e) {
   return { resourceType: "OperationOutcome", issue: [{ severity: "error", code: "invalid", details: { text: r6 }, ...e ? { expression: oe(e) } : void 0 }] };
 }
 function T(r6, e, t, n) {
   return { resourceType: "OperationOutcome", issue: [{ severity: "error", code: t ?? "structure", details: { text: r6 }, ...e ? { expression: e } : void 0, ...n ? { diagnostics: n } : void 0 }] };
 }
-function br(r6) {
+function Sr(r6) {
   return !r6 || typeof r6 != "object" ? false : r6 instanceof Error || typeof DOMException < "u" && r6 instanceof DOMException ? true : Object.prototype.toString.call(r6) === "[object Error]";
 }
 function ze(r6) {
   return typeof r6 == "object" && r6 !== null && r6.resourceType === "OperationOutcome";
 }
-function Er(r6) {
-  return r6.id === mt || r6.id === ht || r6.id === gr || r6.id === gt;
+function br(r6) {
+  return r6.id === mt || r6.id === ht || r6.id === hr || r6.id === gt;
 }
 var f = class extends Error {
   constructor(t, n) {
@@ -52922,10 +52935,10 @@ var f = class extends Error {
   }
 };
 function yt(r6) {
-  return r6 instanceof f ? r6.outcome : ze(r6) ? r6 : P(Ne(r6));
+  return r6 instanceof f ? r6.outcome : ze(r6) ? r6 : P(Se(r6));
 }
-function Ne(r6) {
-  return r6 ? typeof r6 == "string" ? r6 : br(r6) ? r6.message : ze(r6) ? Bn(r6) : typeof r6 == "object" && "code" in r6 && typeof r6.code == "string" ? r6.code : JSON.stringify(r6) : "Unknown error";
+function Se(r6) {
+  return r6 ? typeof r6 == "string" ? r6 : Sr(r6) ? r6.message : ze(r6) ? Bn(r6) : typeof r6 == "object" && "code" in r6 && typeof r6.code == "string" ? r6.code : JSON.stringify(r6) : "Unknown error";
 }
 function Bn(r6) {
   let e = r6.issue?.map(Uo) ?? [];
@@ -52945,44 +52958,44 @@ function jn(r6) {
   return e;
 }
 var $n = { Element: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] } } }, BackboneElement: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, modifierExtension: { max: 9007199254740991, type: [{ code: "Extension" }] } } }, Address: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, use: { type: [{ code: "code" }] }, type: { type: [{ code: "code" }] }, text: { type: [{ code: "string" }] }, line: { max: 9007199254740991, type: [{ code: "string" }] }, city: { type: [{ code: "string" }] }, district: { type: [{ code: "string" }] }, state: { type: [{ code: "string" }] }, postalCode: { type: [{ code: "string" }] }, country: { type: [{ code: "string" }] }, period: { type: [{ code: "Period" }] } } }, Age: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, value: { type: [{ code: "decimal" }] }, comparator: { type: [{ code: "code" }] }, unit: { type: [{ code: "string" }] }, system: { type: [{ code: "uri" }] }, code: { type: [{ code: "code" }] } } }, Annotation: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, "author[x]": { type: [{ code: "Reference", targetProfile: ["http://hl7.org/fhir/StructureDefinition/Practitioner", "http://hl7.org/fhir/StructureDefinition/Patient", "http://hl7.org/fhir/StructureDefinition/RelatedPerson", "http://hl7.org/fhir/StructureDefinition/Organization"] }, { code: "string" }] }, time: { type: [{ code: "dateTime" }] }, text: { min: 1, type: [{ code: "markdown" }] } } }, Attachment: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, contentType: { type: [{ code: "code" }] }, language: { type: [{ code: "code" }] }, data: { type: [{ code: "base64Binary" }] }, url: { type: [{ code: "url" }] }, size: { type: [{ code: "unsignedInt" }] }, hash: { type: [{ code: "base64Binary" }] }, title: { type: [{ code: "string" }] }, creation: { type: [{ code: "dateTime" }] } } }, CodeableConcept: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, coding: { max: 9007199254740991, type: [{ code: "Coding" }] }, text: { type: [{ code: "string" }] } } }, Coding: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, system: { type: [{ code: "uri" }] }, version: { type: [{ code: "string" }] }, code: { type: [{ code: "code" }] }, display: { type: [{ code: "string" }] }, userSelected: { type: [{ code: "boolean" }] } } }, ContactDetail: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, name: { type: [{ code: "string" }] }, telecom: { max: 9007199254740991, type: [{ code: "ContactPoint" }] } } }, ContactPoint: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, system: { type: [{ code: "code" }] }, value: { type: [{ code: "string" }] }, use: { type: [{ code: "code" }] }, rank: { type: [{ code: "positiveInt" }] }, period: { type: [{ code: "Period" }] } } }, Contributor: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, type: { min: 1, type: [{ code: "code" }] }, name: { min: 1, type: [{ code: "string" }] }, contact: { max: 9007199254740991, type: [{ code: "ContactDetail" }] } } }, Count: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, value: { type: [{ code: "decimal" }] }, comparator: { type: [{ code: "code" }] }, unit: { type: [{ code: "string" }] }, system: { type: [{ code: "uri" }] }, code: { type: [{ code: "code" }] } } }, DataRequirement: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, type: { min: 1, type: [{ code: "code" }] }, profile: { max: 9007199254740991, type: [{ code: "canonical", targetProfile: ["http://hl7.org/fhir/StructureDefinition/StructureDefinition"] }] }, "subject[x]": { type: [{ code: "CodeableConcept" }, { code: "Reference", targetProfile: ["http://hl7.org/fhir/StructureDefinition/Group"] }] }, mustSupport: { max: 9007199254740991, type: [{ code: "string" }] }, codeFilter: { max: 9007199254740991, type: [{ code: "DataRequirementCodeFilter" }] }, dateFilter: { max: 9007199254740991, type: [{ code: "DataRequirementDateFilter" }] }, limit: { type: [{ code: "positiveInt" }] }, sort: { max: 9007199254740991, type: [{ code: "DataRequirementSort" }] } } }, DataRequirementCodeFilter: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, path: { type: [{ code: "string" }] }, searchParam: { type: [{ code: "string" }] }, valueSet: { type: [{ code: "canonical", targetProfile: ["http://hl7.org/fhir/StructureDefinition/ValueSet"] }] }, code: { max: 9007199254740991, type: [{ code: "Coding" }] } } }, DataRequirementDateFilter: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, path: { type: [{ code: "string" }] }, searchParam: { type: [{ code: "string" }] }, "value[x]": { type: [{ code: "dateTime" }, { code: "Period" }, { code: "Duration" }] } } }, DataRequirementSort: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, path: { min: 1, type: [{ code: "string" }] }, direction: { min: 1, type: [{ code: "code" }] } } }, Distance: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, value: { type: [{ code: "decimal" }] }, comparator: { type: [{ code: "code" }] }, unit: { type: [{ code: "string" }] }, system: { type: [{ code: "uri" }] }, code: { type: [{ code: "code" }] } } }, Dosage: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, modifierExtension: { max: 9007199254740991, type: [{ code: "Extension" }] }, sequence: { type: [{ code: "integer" }] }, text: { type: [{ code: "string" }] }, additionalInstruction: { max: 9007199254740991, type: [{ code: "CodeableConcept" }] }, patientInstruction: { type: [{ code: "string" }] }, timing: { type: [{ code: "Timing" }] }, "asNeeded[x]": { type: [{ code: "boolean" }, { code: "CodeableConcept" }] }, site: { type: [{ code: "CodeableConcept" }] }, route: { type: [{ code: "CodeableConcept" }] }, method: { type: [{ code: "CodeableConcept" }] }, doseAndRate: { max: 9007199254740991, type: [{ code: "DosageDoseAndRate" }] }, maxDosePerPeriod: { type: [{ code: "Ratio" }] }, maxDosePerAdministration: { type: [{ code: "Quantity", profile: ["http://hl7.org/fhir/StructureDefinition/SimpleQuantity"] }] }, maxDosePerLifetime: { type: [{ code: "Quantity", profile: ["http://hl7.org/fhir/StructureDefinition/SimpleQuantity"] }] } } }, DosageDoseAndRate: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, type: { type: [{ code: "CodeableConcept" }] }, "dose[x]": { type: [{ code: "Range" }, { code: "Quantity", profile: ["http://hl7.org/fhir/StructureDefinition/SimpleQuantity"] }] }, "rate[x]": { type: [{ code: "Ratio" }, { code: "Range" }, { code: "Quantity", profile: ["http://hl7.org/fhir/StructureDefinition/SimpleQuantity"] }] } } }, Duration: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, value: { type: [{ code: "decimal" }] }, comparator: { type: [{ code: "code" }] }, unit: { type: [{ code: "string" }] }, system: { type: [{ code: "uri" }] }, code: { type: [{ code: "code" }] } } }, ElementDefinition: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, modifierExtension: { max: 9007199254740991, type: [{ code: "Extension" }] }, path: { min: 1, type: [{ code: "string" }] }, representation: { max: 9007199254740991, type: [{ code: "code" }] }, sliceName: { type: [{ code: "string" }] }, sliceIsConstraining: { type: [{ code: "boolean" }] }, label: { type: [{ code: "string" }] }, code: { max: 9007199254740991, type: [{ code: "Coding" }] }, slicing: { type: [{ code: "ElementDefinitionSlicing" }] }, short: { type: [{ code: "string" }] }, definition: { type: [{ code: "markdown" }] }, comment: { type: [{ code: "markdown" }] }, requirements: { type: [{ code: "markdown" }] }, alias: { max: 9007199254740991, type: [{ code: "string" }] }, min: { type: [{ code: "unsignedInt" }] }, max: { type: [{ code: "string" }] }, base: { type: [{ code: "ElementDefinitionBase" }] }, contentReference: { type: [{ code: "uri" }] }, type: { max: 9007199254740991, type: [{ code: "ElementDefinitionType" }] }, "defaultValue[x]": { type: [{ code: "base64Binary" }, { code: "boolean" }, { code: "canonical" }, { code: "code" }, { code: "date" }, { code: "dateTime" }, { code: "decimal" }, { code: "id" }, { code: "instant" }, { code: "integer" }, { code: "markdown" }, { code: "oid" }, { code: "positiveInt" }, { code: "string" }, { code: "time" }, { code: "unsignedInt" }, { code: "uri" }, { code: "url" }, { code: "uuid" }, { code: "Address" }, { code: "Age" }, { code: "Annotation" }, { code: "Attachment" }, { code: "CodeableConcept" }, { code: "Coding" }, { code: "ContactPoint" }, { code: "Count" }, { code: "Distance" }, { code: "Duration" }, { code: "HumanName" }, { code: "Identifier" }, { code: "Money" }, { code: "Period" }, { code: "Quantity" }, { code: "Range" }, { code: "Ratio" }, { code: "Reference" }, { code: "SampledData" }, { code: "Signature" }, { code: "Timing" }, { code: "ContactDetail" }, { code: "Contributor" }, { code: "DataRequirement" }, { code: "Expression" }, { code: "ParameterDefinition" }, { code: "RelatedArtifact" }, { code: "TriggerDefinition" }, { code: "UsageContext" }, { code: "Dosage" }, { code: "Meta" }] }, meaningWhenMissing: { type: [{ code: "markdown" }] }, orderMeaning: { type: [{ code: "string" }] }, "fixed[x]": { type: [{ code: "base64Binary" }, { code: "boolean" }, { code: "canonical" }, { code: "code" }, { code: "date" }, { code: "dateTime" }, { code: "decimal" }, { code: "id" }, { code: "instant" }, { code: "integer" }, { code: "markdown" }, { code: "oid" }, { code: "positiveInt" }, { code: "string" }, { code: "time" }, { code: "unsignedInt" }, { code: "uri" }, { code: "url" }, { code: "uuid" }, { code: "Address" }, { code: "Age" }, { code: "Annotation" }, { code: "Attachment" }, { code: "CodeableConcept" }, { code: "Coding" }, { code: "ContactPoint" }, { code: "Count" }, { code: "Distance" }, { code: "Duration" }, { code: "HumanName" }, { code: "Identifier" }, { code: "Money" }, { code: "Period" }, { code: "Quantity" }, { code: "Range" }, { code: "Ratio" }, { code: "Reference" }, { code: "SampledData" }, { code: "Signature" }, { code: "Timing" }, { code: "ContactDetail" }, { code: "Contributor" }, { code: "DataRequirement" }, { code: "Expression" }, { code: "ParameterDefinition" }, { code: "RelatedArtifact" }, { code: "TriggerDefinition" }, { code: "UsageContext" }, { code: "Dosage" }, { code: "Meta" }] }, "pattern[x]": { type: [{ code: "base64Binary" }, { code: "boolean" }, { code: "canonical" }, { code: "code" }, { code: "date" }, { code: "dateTime" }, { code: "decimal" }, { code: "id" }, { code: "instant" }, { code: "integer" }, { code: "markdown" }, { code: "oid" }, { code: "positiveInt" }, { code: "string" }, { code: "time" }, { code: "unsignedInt" }, { code: "uri" }, { code: "url" }, { code: "uuid" }, { code: "Address" }, { code: "Age" }, { code: "Annotation" }, { code: "Attachment" }, { code: "CodeableConcept" }, { code: "Coding" }, { code: "ContactPoint" }, { code: "Count" }, { code: "Distance" }, { code: "Duration" }, { code: "HumanName" }, { code: "Identifier" }, { code: "Money" }, { code: "Period" }, { code: "Quantity" }, { code: "Range" }, { code: "Ratio" }, { code: "Reference" }, { code: "SampledData" }, { code: "Signature" }, { code: "Timing" }, { code: "ContactDetail" }, { code: "Contributor" }, { code: "DataRequirement" }, { code: "Expression" }, { code: "ParameterDefinition" }, { code: "RelatedArtifact" }, { code: "TriggerDefinition" }, { code: "UsageContext" }, { code: "Dosage" }, { code: "Meta" }] }, example: { max: 9007199254740991, type: [{ code: "ElementDefinitionExample" }] }, "minValue[x]": { type: [{ code: "date" }, { code: "dateTime" }, { code: "instant" }, { code: "time" }, { code: "decimal" }, { code: "integer" }, { code: "positiveInt" }, { code: "unsignedInt" }, { code: "Quantity" }] }, "maxValue[x]": { type: [{ code: "date" }, { code: "dateTime" }, { code: "instant" }, { code: "time" }, { code: "decimal" }, { code: "integer" }, { code: "positiveInt" }, { code: "unsignedInt" }, { code: "Quantity" }] }, maxLength: { type: [{ code: "integer" }] }, condition: { max: 9007199254740991, type: [{ code: "id" }] }, constraint: { max: 9007199254740991, type: [{ code: "ElementDefinitionConstraint" }] }, mustSupport: { type: [{ code: "boolean" }] }, isModifier: { type: [{ code: "boolean" }] }, isModifierReason: { type: [{ code: "string" }] }, isSummary: { type: [{ code: "boolean" }] }, binding: { type: [{ code: "ElementDefinitionBinding" }] }, mapping: { max: 9007199254740991, type: [{ code: "ElementDefinitionMapping" }] } } }, ElementDefinitionSlicingDiscriminator: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, type: { min: 1, type: [{ code: "code" }] }, path: { min: 1, type: [{ code: "string" }] } } }, ElementDefinitionSlicing: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, discriminator: { max: 9007199254740991, type: [{ code: "ElementDefinitionSlicingDiscriminator" }] }, description: { type: [{ code: "string" }] }, ordered: { type: [{ code: "boolean" }] }, rules: { min: 1, type: [{ code: "code" }] } } }, ElementDefinitionBase: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, path: { min: 1, type: [{ code: "string" }] }, min: { min: 1, type: [{ code: "unsignedInt" }] }, max: { min: 1, type: [{ code: "string" }] } } }, ElementDefinitionType: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, code: { min: 1, type: [{ code: "uri" }] }, profile: { max: 9007199254740991, type: [{ code: "canonical", targetProfile: ["http://hl7.org/fhir/StructureDefinition/StructureDefinition", "http://hl7.org/fhir/StructureDefinition/ImplementationGuide"] }] }, targetProfile: { max: 9007199254740991, type: [{ code: "canonical", targetProfile: ["http://hl7.org/fhir/StructureDefinition/StructureDefinition", "http://hl7.org/fhir/StructureDefinition/ImplementationGuide"] }] }, aggregation: { max: 9007199254740991, type: [{ code: "code" }] }, versioning: { type: [{ code: "code" }] } } }, ElementDefinitionExample: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, label: { min: 1, type: [{ code: "string" }] }, "value[x]": { min: 1, type: [{ code: "base64Binary" }, { code: "boolean" }, { code: "canonical" }, { code: "code" }, { code: "date" }, { code: "dateTime" }, { code: "decimal" }, { code: "id" }, { code: "instant" }, { code: "integer" }, { code: "markdown" }, { code: "oid" }, { code: "positiveInt" }, { code: "string" }, { code: "time" }, { code: "unsignedInt" }, { code: "uri" }, { code: "url" }, { code: "uuid" }, { code: "Address" }, { code: "Age" }, { code: "Annotation" }, { code: "Attachment" }, { code: "CodeableConcept" }, { code: "Coding" }, { code: "ContactPoint" }, { code: "Count" }, { code: "Distance" }, { code: "Duration" }, { code: "HumanName" }, { code: "Identifier" }, { code: "Money" }, { code: "Period" }, { code: "Quantity" }, { code: "Range" }, { code: "Ratio" }, { code: "Reference" }, { code: "SampledData" }, { code: "Signature" }, { code: "Timing" }, { code: "ContactDetail" }, { code: "Contributor" }, { code: "DataRequirement" }, { code: "Expression" }, { code: "ParameterDefinition" }, { code: "RelatedArtifact" }, { code: "TriggerDefinition" }, { code: "UsageContext" }, { code: "Dosage" }, { code: "Meta" }] } } }, ElementDefinitionConstraint: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, key: { min: 1, type: [{ code: "id" }] }, requirements: { type: [{ code: "string" }] }, severity: { min: 1, type: [{ code: "code" }] }, human: { min: 1, type: [{ code: "string" }] }, expression: { type: [{ code: "string" }] }, xpath: { type: [{ code: "string" }] }, source: { type: [{ code: "canonical", targetProfile: ["http://hl7.org/fhir/StructureDefinition/StructureDefinition"] }] } } }, ElementDefinitionBinding: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, strength: { min: 1, type: [{ code: "code" }] }, description: { type: [{ code: "string" }] }, valueSet: { type: [{ code: "canonical", targetProfile: ["http://hl7.org/fhir/StructureDefinition/ValueSet"] }] } } }, ElementDefinitionMapping: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, identity: { min: 1, type: [{ code: "id" }] }, language: { type: [{ code: "code" }] }, map: { min: 1, type: [{ code: "string" }] }, comment: { type: [{ code: "string" }] } } }, Expression: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, description: { type: [{ code: "string" }] }, name: { type: [{ code: "id" }] }, language: { min: 1, type: [{ code: "code" }] }, expression: { type: [{ code: "string" }] }, reference: { type: [{ code: "uri" }] } } }, Extension: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, url: { min: 1, type: [{ code: "uri" }] }, "value[x]": { type: [{ code: "base64Binary" }, { code: "boolean" }, { code: "canonical" }, { code: "code" }, { code: "date" }, { code: "dateTime" }, { code: "decimal" }, { code: "id" }, { code: "instant" }, { code: "integer" }, { code: "markdown" }, { code: "oid" }, { code: "positiveInt" }, { code: "string" }, { code: "time" }, { code: "unsignedInt" }, { code: "uri" }, { code: "url" }, { code: "uuid" }, { code: "Address" }, { code: "Age" }, { code: "Annotation" }, { code: "Attachment" }, { code: "CodeableConcept" }, { code: "Coding" }, { code: "ContactPoint" }, { code: "Count" }, { code: "Distance" }, { code: "Duration" }, { code: "HumanName" }, { code: "Identifier" }, { code: "Money" }, { code: "Period" }, { code: "Quantity" }, { code: "Range" }, { code: "Ratio" }, { code: "Reference" }, { code: "SampledData" }, { code: "Signature" }, { code: "Timing" }, { code: "ContactDetail" }, { code: "Contributor" }, { code: "DataRequirement" }, { code: "Expression" }, { code: "ParameterDefinition" }, { code: "RelatedArtifact" }, { code: "TriggerDefinition" }, { code: "UsageContext" }, { code: "Dosage" }, { code: "Meta" }] } } }, HumanName: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, use: { type: [{ code: "code" }] }, text: { type: [{ code: "string" }] }, family: { type: [{ code: "string" }] }, given: { max: 9007199254740991, type: [{ code: "string" }] }, prefix: { max: 9007199254740991, type: [{ code: "string" }] }, suffix: { max: 9007199254740991, type: [{ code: "string" }] }, period: { type: [{ code: "Period" }] } } }, Identifier: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, use: { type: [{ code: "code" }] }, type: { type: [{ code: "CodeableConcept" }] }, system: { type: [{ code: "uri" }] }, value: { type: [{ code: "string" }] }, period: { type: [{ code: "Period" }] }, assigner: { type: [{ code: "Reference", targetProfile: ["http://hl7.org/fhir/StructureDefinition/Organization"] }] } } }, MarketingStatus: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, modifierExtension: { max: 9007199254740991, type: [{ code: "Extension" }] }, country: { min: 1, type: [{ code: "CodeableConcept" }] }, jurisdiction: { type: [{ code: "CodeableConcept" }] }, status: { min: 1, type: [{ code: "CodeableConcept" }] }, dateRange: { min: 1, type: [{ code: "Period" }] }, restoreDate: { type: [{ code: "dateTime" }] } } }, Meta: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, versionId: { type: [{ code: "id" }] }, lastUpdated: { type: [{ code: "instant" }] }, source: { type: [{ code: "uri" }] }, profile: { max: 9007199254740991, type: [{ code: "canonical", targetProfile: ["http://hl7.org/fhir/StructureDefinition/StructureDefinition"] }] }, security: { max: 9007199254740991, type: [{ code: "Coding" }] }, tag: { max: 9007199254740991, type: [{ code: "Coding" }] }, project: { type: [{ code: "uri" }] }, author: { type: [{ code: "Reference" }] }, onBehalfOf: { type: [{ code: "Reference" }] }, account: { type: [{ code: "Reference" }] }, accounts: { max: 9007199254740991, type: [{ code: "Reference" }] }, compartment: { max: 9007199254740991, type: [{ code: "Reference" }] } } }, Money: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, value: { type: [{ code: "decimal" }] }, currency: { type: [{ code: "code" }] } } }, Narrative: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, status: { min: 1, type: [{ code: "code" }] }, div: { min: 1, type: [{ code: "xhtml" }] } } }, ParameterDefinition: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, name: { type: [{ code: "code" }] }, use: { min: 1, type: [{ code: "code" }] }, min: { type: [{ code: "integer" }] }, max: { type: [{ code: "string" }] }, documentation: { type: [{ code: "string" }] }, type: { min: 1, type: [{ code: "code" }] }, profile: { type: [{ code: "canonical", targetProfile: ["http://hl7.org/fhir/StructureDefinition/StructureDefinition"] }] } } }, Period: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, start: { type: [{ code: "dateTime" }] }, end: { type: [{ code: "dateTime" }] } } }, Population: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, modifierExtension: { max: 9007199254740991, type: [{ code: "Extension" }] }, "age[x]": { type: [{ code: "Range" }, { code: "CodeableConcept" }] }, gender: { type: [{ code: "CodeableConcept" }] }, race: { type: [{ code: "CodeableConcept" }] }, physiologicalCondition: { type: [{ code: "CodeableConcept" }] } } }, ProdCharacteristic: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, modifierExtension: { max: 9007199254740991, type: [{ code: "Extension" }] }, height: { type: [{ code: "Quantity" }] }, width: { type: [{ code: "Quantity" }] }, depth: { type: [{ code: "Quantity" }] }, weight: { type: [{ code: "Quantity" }] }, nominalVolume: { type: [{ code: "Quantity" }] }, externalDiameter: { type: [{ code: "Quantity" }] }, shape: { type: [{ code: "string" }] }, color: { max: 9007199254740991, type: [{ code: "string" }] }, imprint: { max: 9007199254740991, type: [{ code: "string" }] }, image: { max: 9007199254740991, type: [{ code: "Attachment" }] }, scoring: { type: [{ code: "CodeableConcept" }] } } }, ProductShelfLife: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, modifierExtension: { max: 9007199254740991, type: [{ code: "Extension" }] }, identifier: { type: [{ code: "Identifier" }] }, type: { min: 1, type: [{ code: "CodeableConcept" }] }, period: { min: 1, type: [{ code: "Quantity" }] }, specialPrecautionsForStorage: { max: 9007199254740991, type: [{ code: "CodeableConcept" }] } } }, Quantity: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, value: { type: [{ code: "decimal" }] }, comparator: { type: [{ code: "code" }] }, unit: { type: [{ code: "string" }] }, system: { type: [{ code: "uri" }] }, code: { type: [{ code: "code" }] } } }, Range: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, low: { type: [{ code: "Quantity", profile: ["http://hl7.org/fhir/StructureDefinition/SimpleQuantity"] }] }, high: { type: [{ code: "Quantity", profile: ["http://hl7.org/fhir/StructureDefinition/SimpleQuantity"] }] } } }, Ratio: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, numerator: { type: [{ code: "Quantity" }] }, denominator: { type: [{ code: "Quantity" }] } } }, Reference: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, reference: { type: [{ code: "string" }] }, type: { type: [{ code: "uri" }] }, identifier: { type: [{ code: "Identifier" }] }, display: { type: [{ code: "string" }] } } }, RelatedArtifact: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, type: { min: 1, type: [{ code: "code" }] }, label: { type: [{ code: "string" }] }, display: { type: [{ code: "string" }] }, citation: { type: [{ code: "markdown" }] }, url: { type: [{ code: "url" }] }, document: { type: [{ code: "Attachment" }] }, resource: { type: [{ code: "canonical", targetProfile: ["http://hl7.org/fhir/StructureDefinition/Resource"] }] } } }, SampledData: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, origin: { min: 1, type: [{ code: "Quantity", profile: ["http://hl7.org/fhir/StructureDefinition/SimpleQuantity"] }] }, period: { min: 1, type: [{ code: "decimal" }] }, factor: { type: [{ code: "decimal" }] }, lowerLimit: { type: [{ code: "decimal" }] }, upperLimit: { type: [{ code: "decimal" }] }, dimensions: { min: 1, type: [{ code: "positiveInt" }] }, data: { type: [{ code: "string" }] } } }, Signature: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, type: { min: 1, max: 9007199254740991, type: [{ code: "Coding" }] }, when: { min: 1, type: [{ code: "instant" }] }, who: { min: 1, type: [{ code: "Reference", targetProfile: ["http://hl7.org/fhir/StructureDefinition/Practitioner", "http://hl7.org/fhir/StructureDefinition/PractitionerRole", "http://hl7.org/fhir/StructureDefinition/RelatedPerson", "http://hl7.org/fhir/StructureDefinition/Patient", "http://hl7.org/fhir/StructureDefinition/Device", "http://hl7.org/fhir/StructureDefinition/Organization"] }] }, onBehalfOf: { type: [{ code: "Reference", targetProfile: ["http://hl7.org/fhir/StructureDefinition/Practitioner", "http://hl7.org/fhir/StructureDefinition/PractitionerRole", "http://hl7.org/fhir/StructureDefinition/RelatedPerson", "http://hl7.org/fhir/StructureDefinition/Patient", "http://hl7.org/fhir/StructureDefinition/Device", "http://hl7.org/fhir/StructureDefinition/Organization"] }] }, targetFormat: { type: [{ code: "code" }] }, sigFormat: { type: [{ code: "code" }] }, data: { type: [{ code: "base64Binary" }] } } }, SubstanceAmount: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, modifierExtension: { max: 9007199254740991, type: [{ code: "Extension" }] }, "amount[x]": { type: [{ code: "Quantity" }, { code: "Range" }, { code: "string" }] }, amountType: { type: [{ code: "CodeableConcept" }] }, amountText: { type: [{ code: "string" }] }, referenceRange: { type: [{ code: "SubstanceAmountReferenceRange" }] } } }, SubstanceAmountReferenceRange: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, lowLimit: { type: [{ code: "Quantity" }] }, highLimit: { type: [{ code: "Quantity" }] } } }, Timing: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, modifierExtension: { max: 9007199254740991, type: [{ code: "Extension" }] }, event: { max: 9007199254740991, type: [{ code: "dateTime" }] }, repeat: { type: [{ code: "TimingRepeat" }] }, code: { type: [{ code: "CodeableConcept" }] } } }, TimingRepeat: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, "bounds[x]": { type: [{ code: "Duration" }, { code: "Range" }, { code: "Period" }] }, count: { type: [{ code: "positiveInt" }] }, countMax: { type: [{ code: "positiveInt" }] }, duration: { type: [{ code: "decimal" }] }, durationMax: { type: [{ code: "decimal" }] }, durationUnit: { type: [{ code: "code" }] }, frequency: { type: [{ code: "positiveInt" }] }, frequencyMax: { type: [{ code: "positiveInt" }] }, period: { type: [{ code: "decimal" }] }, periodMax: { type: [{ code: "decimal" }] }, periodUnit: { type: [{ code: "code" }] }, dayOfWeek: { max: 9007199254740991, type: [{ code: "code" }] }, timeOfDay: { max: 9007199254740991, type: [{ code: "time" }] }, when: { max: 9007199254740991, type: [{ code: "code" }] }, offset: { type: [{ code: "unsignedInt" }] } } }, TriggerDefinition: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, type: { min: 1, type: [{ code: "code" }] }, name: { type: [{ code: "string" }] }, "timing[x]": { type: [{ code: "Timing" }, { code: "Reference", targetProfile: ["http://hl7.org/fhir/StructureDefinition/Schedule"] }, { code: "date" }, { code: "dateTime" }] }, data: { max: 9007199254740991, type: [{ code: "DataRequirement" }] }, condition: { type: [{ code: "Expression" }] } } }, UsageContext: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, code: { min: 1, type: [{ code: "Coding" }] }, "value[x]": { min: 1, type: [{ code: "CodeableConcept" }, { code: "Quantity" }, { code: "Range" }, { code: "Reference", targetProfile: ["http://hl7.org/fhir/StructureDefinition/PlanDefinition", "http://hl7.org/fhir/StructureDefinition/ResearchStudy", "http://hl7.org/fhir/StructureDefinition/InsurancePlan", "http://hl7.org/fhir/StructureDefinition/HealthcareService", "http://hl7.org/fhir/StructureDefinition/Group", "http://hl7.org/fhir/StructureDefinition/Location", "http://hl7.org/fhir/StructureDefinition/Organization"] }] } } }, MoneyQuantity: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, value: { type: [{ code: "decimal" }] }, comparator: { type: [{ code: "code" }] }, unit: { type: [{ code: "string" }] }, system: { type: [{ code: "uri" }] }, code: { type: [{ code: "code" }] } } }, SimpleQuantity: { elements: { id: { type: [{ code: "string" }] }, extension: { max: 9007199254740991, type: [{ code: "Extension" }] }, value: { type: [{ code: "decimal" }] }, comparator: { max: 0, type: [{ code: "code" }] }, unit: { type: [{ code: "string" }] }, system: { type: [{ code: "uri" }] }, code: { type: [{ code: "code" }] } } }, IdentityProvider: { elements: { authorizeUrl: { min: 1, type: [{ code: "string" }] }, tokenUrl: { min: 1, type: [{ code: "string" }] }, tokenAuthMethod: { type: [{ code: "code" }] }, userInfoUrl: { min: 1, type: [{ code: "string" }] }, clientId: { min: 1, type: [{ code: "string" }] }, clientSecret: { min: 1, type: [{ code: "string" }] }, usePkce: { type: [{ code: "boolean" }] }, useSubject: { type: [{ code: "boolean" }] }, identitySource: { type: [{ code: "code" }] }, identityMappingMode: { type: [{ code: "code" }] } } } };
-function Ar(r6) {
-  return new Cr(r6).parse();
+function Pr(r6) {
+  return new Rr(r6).parse();
 }
-var be = jn($n);
-var wr = /* @__PURE__ */ Object.create(null);
+var Ee = jn($n);
+var Ar = /* @__PURE__ */ Object.create(null);
 var Hn = /* @__PURE__ */ Object.create(null);
 var jo = { "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" };
 function Jn(r6) {
   let e;
   return e = Hn[r6], e || (e = Hn[r6] = /* @__PURE__ */ Object.create(null)), e;
 }
-function Or(r6) {
+function wr(r6) {
   let t = (Array.isArray(r6) ? r6 : r6.entry?.map((n) => n.resource) ?? []).filter((n) => n?.resourceType === "StructureDefinition");
   ei(t);
-  for (let n of t) Ir(n);
+  for (let n of t) Or(n);
 }
-function Ir(r6) {
+function Or(r6) {
   if (!r6?.name) throw new Error("Failed loading StructureDefinition from bundle");
   if (r6.resourceType !== "StructureDefinition") return;
-  let e = Ar(r6), t = jo[r6.url], n, i;
-  t ? (n = be, i = t) : r6.url === `http://hl7.org/fhir/StructureDefinition/${r6.type}` || r6.url === `https://medplum.com/fhir/StructureDefinition/${r6.type}` || r6.type?.startsWith("http://") || r6.type?.startsWith("https://") ? (n = be, i = r6.type) : (n = Jn(r6.url), i = r6.type), n[i] = e;
+  let e = Pr(r6), t = jo[r6.url], n, i;
+  t ? (n = Ee, i = t) : r6.url === `http://hl7.org/fhir/StructureDefinition/${r6.type}` || r6.url === `https://medplum.com/fhir/StructureDefinition/${r6.type}` || r6.type?.startsWith("http://") || r6.type?.startsWith("https://") ? (n = Ee, i = r6.type) : (n = Jn(r6.url), i = r6.type), n[i] = e;
   for (let o2 of e.innerTypes) o2.parentType = e, n[o2.name] = o2;
-  wr[r6.url] = e;
+  Ar[r6.url] = e;
 }
 function Yn(r6) {
-  return !!be[r6];
+  return !!Ee[r6];
 }
-function Ee(r6, e) {
+function Re(r6, e) {
   if (e) {
     let t = Jn(e)[r6];
     if (t) return t;
   }
-  return be[r6];
+  return Ee[r6];
 }
 function Xn(r6) {
-  return !!wr[r6];
+  return !!Ar[r6];
 }
-var Cr = class {
+var Rr = class {
   constructor(e) {
     c(this, "root");
     c(this, "elements");
@@ -53001,7 +53014,7 @@ var Cr = class {
       if (e.sliceName) this.parseSliceStart(e);
       else if (e.id?.includes(":")) {
         if (this.slicingContext?.current) {
-          let t = Rr(e, this.slicingContext.path);
+          let t = Er(e, this.slicingContext.path);
           this.slicingContext.current.elements[t] = this.parseElementDefinition(e);
         }
       } else {
@@ -53010,13 +53023,13 @@ var Cr = class {
         let n = this.backboneContext;
         for (; n; ) {
           if (e.path?.startsWith(n.path + ".")) {
-            n.type.elements[Rr(e, n.path)] = t;
+            n.type.elements[Er(e, n.path)] = t;
             break;
           }
           n = n.parent;
         }
         if (!n) {
-          let i = Rr(e, this.root.path);
+          let i = Er(e, this.root.path);
           e.isSummary && this.resourceSchema.summaryProperties?.add(i.replace("[x]", "")), t.min > 0 && this.resourceSchema.mandatoryProperties?.add(i.replace("[x]", "")), this.resourceSchema.elements[i] = t;
         }
         this.checkFieldExit(e);
@@ -53030,7 +53043,7 @@ var Cr = class {
   }
   enterInnerType(e) {
     for (; this.backboneContext && !Fe(this.backboneContext?.path, e.path); ) this.innerTypes.push(this.backboneContext.type), this.backboneContext = this.backboneContext.parent;
-    let t = Pr(e);
+    let t = Cr(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: Fe(this.backboneContext?.path, e.path) ? this.backboneContext : this.backboneContext?.parent };
   }
   enterSlice(e, t) {
@@ -53070,7 +53083,7 @@ var Cr = class {
   parseElementDefinitionType(e) {
     return (e.type ?? []).map((t) => {
       let n;
-      return (t.code === "BackboneElement" || t.code === "Element") && (n = Pr(e)), n || (n = pe(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 = Cr(e)), n || (n = pe(t, "http://hl7.org/fhir/StructureDefinition/structuredefinition-fhir-type")?.valueUrl), n || (n = t.code ?? ""), { code: n, targetProfile: t.targetProfile, profile: t.profile };
     });
   }
   parseElementDefinition(e) {
@@ -53081,7 +53094,7 @@ var Cr = class {
 function Qn(r6) {
   return r6 === "*" ? Number.POSITIVE_INFINITY : Number.parseInt(r6, 10);
 }
-function Rr(r6, e = "") {
+function Er(r6, e = "") {
   return Ho(r6.path, e);
 }
 function Ho(r6, e) {
@@ -53101,7 +53114,7 @@ function Qo(r6) {
   let e = r6.description;
   return e?.startsWith(`Base StructureDefinition for ${r6.name} Type: `) && (e = e.substring(`Base StructureDefinition for ${r6.name} Type: `.length)), e;
 }
-function _r(r6, e, t) {
+function Mr(r6, e, t) {
   let n = r6.path;
   return zo(L(r6, e, t), n, e);
 }
@@ -53115,7 +53128,7 @@ function h(r6) {
   return [{ type: d.boolean, value: r6 }];
 }
 function b(r6) {
-  return r6 == null ? { type: "undefined", value: void 0 } : Number.isSafeInteger(r6) ? { type: d.integer, value: r6 } : typeof r6 == "number" ? { type: d.decimal, value: r6 } : typeof r6 == "boolean" ? { type: d.boolean, value: r6 } : typeof r6 == "string" ? { type: d.string, value: r6 } : V(r6) ? { type: d.Quantity, value: r6 } : I(r6) ? { type: r6.resourceType, value: r6 } : $r(r6) ? { type: d.CodeableConcept, value: r6 } : jr(r6) ? { type: d.Coding, value: r6 } : { type: d.BackboneElement, value: r6 };
+  return r6 == null ? { type: "undefined", value: void 0 } : Number.isSafeInteger(r6) ? { type: d.integer, value: r6 } : typeof r6 == "number" ? { type: d.decimal, value: r6 } : typeof r6 == "boolean" ? { type: d.boolean, value: r6 } : typeof r6 == "string" ? { type: d.string, value: r6 } : V(r6) ? { type: d.Quantity, value: r6 } : I(r6) ? { type: r6.resourceType, value: r6 } : jr(r6) ? { type: d.CodeableConcept, value: r6 } : qr(r6) ? { type: d.Coding, value: r6 } : { type: d.BackboneElement, value: r6 };
 }
 function j(r6) {
   return r6.length === 0 ? false : !!r6[0].value;
@@ -53145,11 +53158,11 @@ function os(r6, e, t) {
   }
   if (a) if (Array.isArray(o2)) {
     o2 = o2.slice();
-    for (let v2 = 0; v2 < Math.max(o2.length, a.length); v2++) o2[v2] = Br(o2[v2], a[v2]);
+    for (let v2 = 0; v2 < Math.max(o2.length, a.length); v2++) o2[v2] = Ur(o2[v2], a[v2]);
   } else if (!o2 && Array.isArray(a)) {
     o2 = a.slice();
-    for (let v2 = 0; v2 < a.length; v2++) o2[v2] = Br(void 0, a[v2]);
-  } else o2 = Br(o2, a);
+    for (let v2 = 0; v2 < a.length; v2++) o2[v2] = Ur(void 0, a[v2]);
+  } else o2 = Ur(o2, a);
   if (!A(o2)) return (s === "Element" || s === "BackboneElement") && (s = t.type[0].code), Array.isArray(o2) ? o2.map((v2) => ti(v2, s)) : ti(o2, s);
 }
 function ti(r6, e) {
@@ -53201,14 +53214,14 @@ function si(r6, e) {
 }
 function Ke(r6, e) {
   let t = r6.value?.valueOf(), n = e.value?.valueOf();
-  return typeof t == "number" && typeof n == "number" ? h(Math.abs(t - n) < 1e-8) : V(t) && V(n) ? h(ui(t, n)) : h(typeof t == "object" && typeof n == "object" ? qr(r6, e) : t === n);
+  return typeof t == "number" && typeof n == "number" ? h(Math.abs(t - n) < 1e-8) : V(t) && V(n) ? h(ui(t, n)) : h(typeof t == "object" && typeof n == "object" ? Wr(r6, e) : t === n);
 }
-function Wr(r6, e) {
+function Br(r6, e) {
   return r6.length === 0 && e.length === 0 ? h(true) : r6.length !== e.length ? h(false) : (r6.sort(ri), e.sort(ri), h(r6.every((t, n) => j(as(t, e[n])))));
 }
 function as(r6, e) {
   let { type: t, value: n } = r6, { type: i, value: o2 } = e, s = n?.valueOf(), a = o2?.valueOf();
-  return typeof s == "number" && typeof a == "number" ? h(Math.abs(s - a) < 0.01) : V(s) && V(a) ? h(ui(s, a)) : h(t === "Coding" && i === "Coding" ? typeof s != "object" || typeof a != "object" ? false : s.code === a.code && s.system === a.system : typeof s == "object" && typeof a == "object" ? qr({ ...s, id: void 0 }, { ...a, id: void 0 }) : typeof s == "string" && typeof a == "string" ? s.toLowerCase() === a.toLowerCase() : s === a);
+  return typeof s == "number" && typeof a == "number" ? h(Math.abs(s - a) < 0.01) : V(s) && V(a) ? h(ui(s, a)) : h(t === "Coding" && i === "Coding" ? typeof s != "object" || typeof a != "object" ? false : s.code === a.code && s.system === a.system : typeof s == "object" && typeof a == "object" ? Wr({ ...s, id: void 0 }, { ...a, id: void 0 }) : typeof s == "string" && typeof a == "string" ? s.toLowerCase() === a.toLowerCase() : s === a);
 }
 function ri(r6, e) {
   let t = r6.value?.valueOf(), n = e.value?.valueOf();
@@ -53253,13 +53266,13 @@ function V(r6) {
 function ui(r6, e) {
   return Math.abs(r6.value - e.value) < 0.01 && (r6.unit === e.unit || r6.code === e.code || r6.unit === e.code || r6.code === e.unit);
 }
-function qr(r6, e) {
+function Wr(r6, e) {
   let t = Object.keys(r6), n = Object.keys(e);
   if (t.length !== n.length) return false;
   for (let i of t) {
     let o2 = r6[i], s = e[i];
     if (ni(o2) && ni(s)) {
-      if (!qr(o2, s)) return false;
+      if (!Wr(o2, s)) return false;
     } else if (o2 !== s) return false;
   }
   return true;
@@ -53267,7 +53280,7 @@ function qr(r6, e) {
 function ni(r6) {
   return r6 !== null && typeof r6 == "object";
 }
-function Br(r6, e) {
+function Ur(r6, e) {
   if (e) {
     if (typeof e != "object") throw new Error("Primitive extension must be an object");
     return cs(r6 ?? {}, e);
@@ -53280,7 +53293,7 @@ function cs(r6, e) {
 function Xe(r6, e) {
   return I(r6, e) && "id" in r6 && typeof r6.id == "string";
 }
-function Re(r6) {
+function Ce(r6) {
   let e = O(r6) ?? "undefined/undefined", t = ls(r6);
   return t === e ? { reference: e } : { reference: e, display: t };
 }
@@ -53288,7 +53301,7 @@ function O(r6) {
   if (Q(r6)) return r6.reference;
   if (Xe(r6)) return `${r6.resourceType}/${r6.id}`;
 }
-function Ce(r6) {
+function Pe(r6) {
   if (r6) return Q(r6) ? r6.reference.split("/")[1] : r6.id;
 }
 function us(r6) {
@@ -53309,7 +53322,7 @@ function ls(r6) {
   if ("name" in r6 && r6.name && typeof r6.name == "string") return r6.name;
   if ("code" in r6 && r6.code) {
     let e = r6.code;
-    if (Array.isArray(e) && (e = e[0]), $r(e)) return Ye(e);
+    if (Array.isArray(e) && (e = e[0]), jr(e)) return Ye(e);
     if (Ts(e)) return e.text;
   }
   return O(r6) ?? "";
@@ -53340,10 +53353,10 @@ function pe(r6, ...e) {
   return t;
 }
 function At(r6, e) {
-  let t = Jr(r6);
+  let t = zr(r6);
   return JSON.stringify(t, null, e ? 2 : void 0) ?? "";
 }
-function Jr(r6) {
+function zr(r6) {
   if (!(r6 == null || r6 === "")) return typeof r6 == "object" ? Array.isArray(r6) ? fs2(r6) : ms(r6) : r6;
 }
 function fs2(r6) {
@@ -53351,7 +53364,7 @@ function fs2(r6) {
   if (e === 0) return;
   let t, n = 0;
   for (let i = 0; i < e; i++) {
-    let o2 = r6[i], s = Jr(o2);
+    let o2 = r6[i], s = zr(o2);
     s !== o2 && !t && (t = Array.from(r6)), s === void 0 ? t && (t[i] = null) : (t && (t[i] = s), n++);
   }
   if (n !== 0) return t ?? r6;
@@ -53359,7 +53372,7 @@ function fs2(r6) {
 function ms(r6) {
   let e, t = 0;
   for (let n in r6) {
-    let i = r6[n], o2 = Jr(i);
+    let i = r6[n], o2 = zr(i);
     o2 !== i && !e && (e = { ...r6 }), o2 === void 0 ? e && delete e[n] : (e && (e[n] = o2), t++);
   }
   if (t !== 0) return e ?? r6;
@@ -53396,11 +53409,11 @@ function gs(r6, e, t) {
 function C(r6) {
   return r6 !== null && typeof r6 == "object";
 }
-function jr(r6) {
+function qr(r6) {
   return C(r6) && "code" in r6 && typeof r6.code == "string";
 }
-function $r(r6) {
-  return C(r6) && "coding" in r6 && Array.isArray(r6.coding) && r6.coding.every(jr);
+function jr(r6) {
+  return C(r6) && "coding" in r6 && Array.isArray(r6.coding) && r6.coding.every(qr);
 }
 function Ts(r6) {
   return C(r6) && "text" in r6 && typeof r6.text == "string";
@@ -53423,7 +53436,7 @@ function gi(r6) {
 function N(r6) {
   return r6 ? r6.charAt(0).toUpperCase() + r6.substring(1) : "";
 }
-var Yr = (r6, e) => new Promise((t, n) => {
+var Kr = (r6, e) => new Promise((t, n) => {
   e?.signal?.throwIfAborted();
   let i = setTimeout(t, r6);
   e?.signal?.addEventListener("abort", () => {
@@ -53442,14 +53455,14 @@ function qe(r6, e, t) {
 function wt(r6) {
   return r6.sort((e, t) => e.localeCompare(t));
 }
-function Xr(r6) {
+function Yr(r6) {
   return r6.endsWith("/") ? r6 : r6 + "/";
 }
 function As(r6) {
   return r6.startsWith("/") ? r6.slice(1) : r6;
 }
 function U(r6, e) {
-  return new URL(As(e), Xr(r6.toString())).toString();
+  return new URL(As(e), Yr(r6.toString())).toString();
 }
 function Ti(r6, e) {
   return U(r6, e).toString().replace("http://", "ws://").replace("https://", "wss://");
@@ -53466,25 +53479,25 @@ function Ze(r6, e) {
   if (!r6) return "";
   let t = [];
   if (r6.prefix && e?.prefix !== false && t.push(...r6.prefix), r6.given && t.push(...r6.given), r6.family && t.push(r6.family), r6.suffix && e?.suffix !== false && t.push(...r6.suffix), r6.use && (e?.all || e?.use) && t.push("[" + r6.use + "]"), t.length === 0) {
-    let n = Ae(r6.text);
+    let n = we(r6.text);
     if (n) return n;
   }
   return t.join(" ").trim();
 }
 function Ye(r6) {
   if (!r6) return "";
-  let e = Ae(r6.text);
+  let e = we(r6.text);
   return e || (r6.coding ? r6.coding.map((t) => Ei(t)).join(", ") : "");
 }
 function Ei(r6, e) {
-  let t = Ae(r6?.display);
+  let t = we(r6?.display);
   if (t) {
-    let n = e ? Ae(r6?.code) : void 0;
+    let n = e ? we(r6?.code) : void 0;
     return `${t}${n ? " (" + n + ")" : ""}`;
   }
-  return Ae(r6?.code) ?? "";
+  return we(r6?.code) ?? "";
 }
-function Ae(r6) {
+function we(r6) {
   return typeof r6 == "string" ? r6 : void 0;
 }
 var d = { 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", Element: "Element", ElementDefinition: "ElementDefinition", Expression: "Expression", Extension: "Extension", HumanName: "HumanName", Identifier: "Identifier", MarketingStatus: "MarketingStatus", Meta: "Meta", Money: "Money", MoneyQuantity: "MoneyQuantity", 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", SimpleQuantity: "SimpleQuantity", 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", xhtml: "xhtml" };
@@ -53496,13 +53509,13 @@ function Pi(r6) {
   let e = $.types[r6];
   return e || (e = { searchParamsDetails: {} }, $.types[r6] = e), !e.searchParams && r6 !== "Binary" && (e.searchParams = { _id: { base: [r6], code: "_id", type: "token", expression: r6 + ".id" }, _lastUpdated: { base: [r6], code: "_lastUpdated", type: "date", expression: r6 + ".meta.lastUpdated" }, _compartment: { base: [r6], code: "_compartment", type: "reference", expression: r6 + ".meta.compartment" }, _profile: { base: [r6], code: "_profile", type: "uri", expression: r6 + ".meta.profile" }, _security: { base: [r6], code: "_security", type: "token", expression: r6 + ".meta.security" }, _source: { base: [r6], code: "_source", type: "uri", expression: r6 + ".meta.source" }, _tag: { base: [r6], code: "_tag", type: "token", expression: r6 + ".meta.tag" }, _project: { base: [r6], code: "_project", type: "token", expression: r6 + ".meta.project" } }), e;
 }
-function en(r6) {
+function Zr(r6) {
   for (let e of r6.base ?? y) {
     let t = Pi(e);
     t.searchParams || (t.searchParams = {}), t.searchParams[r6.code] = r6;
   }
 }
-function Pr(r6) {
+function Cr(r6) {
   let e = r6.type?.[0]?.code;
   return e === "BackboneElement" || e === "Element" ? Us((r6.base?.path ?? r6.path)?.split(".")) : e;
 }
@@ -53510,7 +53523,7 @@ function Us(r6) {
   return r6.length === 1 ? r6[0] : r6.map(N).join("");
 }
 function Ct(r6, e, t) {
-  let n = Ee(r6, t);
+  let n = Re(r6, t);
   if (n) return Ai(n.elements, e);
 }
 function Ai(r6, e) {
@@ -53555,10 +53568,10 @@ var _ = { empty: (r6, e) => h(e.every((t) => A(t.value))), hasValue: (r6, e) =>
   return h(false);
 }, subsetOf: (r6, e, t) => {
   if (e.length === 0) return h(true);
-  let n = t.eval(r6, we(r6));
+  let n = t.eval(r6, Oe(r6));
   return n.length === 0 ? h(false) : h(e.every((i) => n.some((o2) => o2.value === i.value)));
 }, supersetOf: (r6, e, t) => {
-  let n = t.eval(r6, we(r6));
+  let n = t.eval(r6, Oe(r6));
   return n.length === 0 ? h(true) : e.length === 0 ? h(false) : h(n.every((i) => e.some((o2) => o2.value === i.value)));
 }, count: (r6, e) => [{ type: d.integer, value: e.length }], distinct: (r6, e) => {
   let t = [];
@@ -53577,21 +53590,21 @@ var _ = { empty: (r6, e) => h(e.every((t) => A(t.value))), hasValue: (r6, e) =>
   return n <= 0 ? [] : e.slice(0, n);
 }, intersect: (r6, e, t) => {
   if (!t) return e;
-  let n = t.eval(r6, we(r6)), i = [];
+  let n = t.eval(r6, Oe(r6)), i = [];
   for (let o2 of e) !i.some((s) => s.value === o2.value) && n.some((s) => s.value === o2.value) && i.push(o2);
   return i;
 }, exclude: (r6, e, t) => {
   if (!t) return e;
-  let n = t.eval(r6, we(r6)), i = [];
+  let n = t.eval(r6, Oe(r6)), i = [];
   for (let o2 of e) n.some((s) => s.value === o2.value) || i.push(o2);
   return i;
 }, union: (r6, e, t) => {
   if (!t) return e;
-  let n = t.eval(r6, we(r6));
+  let n = t.eval(r6, Oe(r6));
   return bt([...e, ...n]);
 }, combine: (r6, e, t) => {
   if (!t) return e;
-  let n = t.eval(r6, we(r6));
+  let n = t.eval(r6, Oe(r6));
   return [...e, ...n];
 }, htmlChecks: (r6, e, t) => [b(true)], iif: (r6, e, t, n, i) => {
   let o2 = t.eval(r6, e);
@@ -53644,7 +53657,7 @@ var _ = { empty: (r6, e) => h(e.every((t) => A(t.value))), hasValue: (r6, e) =>
   let a = o2, u2 = s ? a + s : i.length;
   return a < 0 || a >= i.length ? void 0 : i.substring(a, u2);
 }, r6, e, t, n), startsWith: (r6, e, t) => H((n, i) => n.startsWith(i), r6, e, t), endsWith: (r6, e, t) => H((n, i) => n.endsWith(i), r6, e, t), contains: (r6, e, t) => H((n, i) => n.includes(i), r6, e, t), upper: (r6, e) => H((t) => t.toUpperCase(), r6, e), lower: (r6, e) => H((t) => t.toLowerCase(), r6, e), replace: (r6, e, t, n) => H((i, o2, s) => i.replaceAll(o2, s), r6, e, t, n), matches: (r6, e, t) => H((n, i) => !!new RegExp(i).exec(n), r6, e, t), replaceMatches: (r6, e, t, n) => H((i, o2, s) => i.replaceAll(new RegExp(o2, "g"), s.replaceAll(/\$\{(\w+)\}/g, "$<$1>")), r6, e, t, n), length: (r6, e) => H((t) => t.length, r6, e), toChars: (r6, e) => H((t) => t ? t.split("") : void 0, r6, e), encode: ae, decode: ae, escape: ae, unescape: ae, trim: ae, split: ae, join: (r6, e, t) => {
-  let n = t?.eval(r6, we(r6))[0]?.value ?? "";
+  let n = t?.eval(r6, Oe(r6))[0]?.value ?? "";
   if (typeof n != "string") throw new TypeError("Separator must be a string.");
   return [{ type: d.string, value: e.map((i) => i.value?.toString() ?? "").join(n) }];
 }, abs: (r6, e) => Z(Math.abs, r6, e), ceiling: (r6, e) => Z(Math.ceil, r6, e), exp: (r6, e) => Z(Math.exp, r6, e), floor: (r6, e) => Z(Math.floor, r6, e), ln: (r6, e) => Z(Math.log, r6, e), log: (r6, e, t) => Z((n, i) => Math.log(n) / Math.log(i), r6, e, t), power: (r6, e, t) => Z(Math.pow, r6, e, t), round: (r6, e, ...t) => Z((n, i = 0) => {
@@ -53695,7 +53708,7 @@ var _ = { empty: (r6, e) => h(e.every((t) => A(t.value))), hasValue: (r6, e) =>
   let n = e[0].value;
   if (!n?.reference) return [];
   let i = "";
-  return t instanceof B && (i = t.name), i && !n.reference.startsWith(i + "/") ? [] : [{ type: d.id, value: Ce(n) }];
+  return t instanceof B && (i = t.name), i && !n.reference.startsWith(i + "/") ? [] : [{ type: d.id, value: Pe(n) }];
 }, extension: (r6, e, t) => {
   let n = t.eval(r6, e)[0].value, i = e?.[0]?.value;
   if (i) {
@@ -53723,7 +53736,7 @@ function ee(r6, e) {
   for (let t of r6) if (t == null) throw new Error("Expected non-null argument");
   return r6;
 }
-function we(r6) {
+function Oe(r6) {
   let e = r6;
   for (; e.parent?.variables.$this; ) e = e.parent;
   return [e.variables.$this];
@@ -53760,7 +53773,7 @@ var B = class {
   }
   evalValue(e) {
     let t = e.value;
-    if (!(!t || typeof t != "object")) return I(t, this.name) ? ("path" in e || (e.path = t.resourceType), e) : _r(e, this.name);
+    if (!(!t || typeof t != "object")) return I(t, this.name) ? ("path" in e || (e.path = t.resourceType), e) : Mr(e, this.name);
   }
   toString() {
     return this.name;
@@ -53849,7 +53862,7 @@ var te = class extends R {
     return `${this.left.toString()}.${this.right.toString()}`;
   }
 };
-var Oe = class extends R {
+var Ie = class extends R {
   constructor(e, t) {
     super("|", e, t);
   }
@@ -53882,7 +53895,7 @@ var Nt = class extends R {
   }
   eval(e, t) {
     let n = this.left.eval(e, t), i = this.right.eval(e, t);
-    return Wr(n, i);
+    return Br(n, i);
   }
 };
 var Ft = class extends R {
@@ -53891,10 +53904,10 @@ var Ft = class extends R {
   }
   eval(e, t) {
     let n = this.left.eval(e, t), i = this.right.eval(e, t);
-    return ii(Wr(n, i));
+    return ii(Br(n, i));
   }
 };
-var Ie = class extends R {
+var ke = class extends R {
   constructor(e, t) {
     super("is", e, t);
   }
@@ -53956,7 +53969,7 @@ var re = class {
     return `${this.name}(${this.args.map((e) => e.toString()).join(", ")})`;
   }
 };
-var ke = class {
+var Ve = class {
   constructor(e, t) {
     c(this, "left");
     c(this, "expr");
@@ -53984,7 +53997,7 @@ var Gs = { parse(r6) {
 var Qs = { parse(r6, e) {
   let t = r6.consumeAndParse();
   if (!r6.match("]")) throw new Error("Parse error: expected `]`");
-  return new ke(e, t);
+  return new Ve(e, t);
 }, precedence: S.Indexer };
 var zs = { parse(r6, e) {
   if (!(e instanceof B)) throw new Error("Unexpected parentheses");
@@ -53997,21 +54010,21 @@ function Js(r6) {
   return n?.startsWith("'") && n.endsWith("'") ? n = n.substring(1, n.length - 1) : n = "{" + n + "}", { value: t, unit: n };
 }
 function rt() {
-  return new pt().registerPrefix("String", { parse: (r6, e) => new G({ type: d.string, value: e.value }) }).registerPrefix("DateTime", { parse: (r6, e) => new G({ type: d.dateTime, value: je(e.value) }) }).registerPrefix("Quantity", { parse: (r6, e) => new G({ type: d.Quantity, value: Js(e.value) }) }).registerPrefix("Number", { parse: (r6, e) => new G({ type: e.value.includes(".") ? d.decimal : d.integer, value: Number.parseFloat(e.value) }) }).registerPrefix("true", { parse: () => new G({ type: d.boolean, value: true }) }).registerPrefix("false", { parse: () => new G({ type: d.boolean, value: false }) }).registerPrefix("Symbol", { parse: (r6, e) => new B(e.value) }).registerPrefix("{}", { parse: () => new It() }).registerPrefix("(", Gs).registerInfix("[", Qs).registerInfix("(", zs).prefix("+", S.UnaryAdd, (r6, e) => new kt("+", e, (t) => t)).prefix("-", S.UnarySubtract, (r6, e) => new F("-", e, e, (t, n) => -n)).infixLeft(".", S.Dot, (r6, e, t) => new te(r6, t)).infixLeft("/", S.Divide, (r6, e, t) => new F("/", r6, t, (n, i) => n / i)).infixLeft("*", S.Multiply, (r6, e, t) => new F("*", r6, t, (n, i) => n * i)).infixLeft("+", S.Add, (r6, e, t) => new F("+", r6, t, (n, i) => n + i)).infixLeft("-", S.Subtract, (r6, e, t) => new F("-", r6, t, (n, i) => n - i)).infixLeft("|", S.Union, (r6, e, t) => new Oe(r6, t)).infixLeft("=", S.Equals, (r6, e, t) => new _t(r6, t)).infixLeft("!=", S.NotEquals, (r6, e, t) => new Lt(r6, t)).infixLeft("~", S.Equivalent, (r6, e, t) => new Nt(r6, t)).infixLeft("!~", S.NotEquivalent, (r6, e, t) => new Ft(r6, t)).infixLeft("<", S.LessThan, (r6, e, t) => new F("<", r6, t, (n, i) => n < i)).infixLeft("<=", S.LessThanOrEquals, (r6, e, t) => new F("<=", r6, t, (n, i) => n <= i)).infixLeft(">", S.GreaterThan, (r6, e, t) => new F(">", r6, t, (n, i) => n > i)).infixLeft(">=", S.GreaterThanOrEquals, (r6, e, t) => new F(">=", r6, t, (n, i) => n >= i)).infixLeft("&", S.Ampersand, (r6, e, t) => new Vt(r6, t)).infixLeft("and", S.And, (r6, e, t) => new Ut(r6, t)).infixLeft("as", S.As, (r6, e, t) => new ye(r6, t)).infixLeft("contains", S.Contains, (r6, e, t) => new Dt(r6, t)).infixLeft("div", S.Divide, (r6, e, t) => new F("div", r6, t, (n, i) => Math.trunc(n / i))).infixLeft("in", S.In, (r6, e, t) => new Mt(r6, t)).infixLeft("is", S.Is, (r6, e, t) => new Ie(r6, t)).infixLeft("mod", S.Modulo, (r6, e, t) => new F("mod", r6, t, (n, i) => n % i)).infixLeft("or", S.Or, (r6, e, t) => new Bt(r6, t)).infixLeft("xor", S.Xor, (r6, e, t) => new Wt(r6, t)).infixLeft("implies", S.Implies, (r6, e, t) => new qt(r6, t));
+  return new pt().registerPrefix("String", { parse: (r6, e) => new G({ type: d.string, value: e.value }) }).registerPrefix("DateTime", { parse: (r6, e) => new G({ type: d.dateTime, value: je(e.value) }) }).registerPrefix("Quantity", { parse: (r6, e) => new G({ type: d.Quantity, value: Js(e.value) }) }).registerPrefix("Number", { parse: (r6, e) => new G({ type: e.value.includes(".") ? d.decimal : d.integer, value: Number.parseFloat(e.value) }) }).registerPrefix("true", { parse: () => new G({ type: d.boolean, value: true }) }).registerPrefix("false", { parse: () => new G({ type: d.boolean, value: false }) }).registerPrefix("Symbol", { parse: (r6, e) => new B(e.value) }).registerPrefix("{}", { parse: () => new It() }).registerPrefix("(", Gs).registerInfix("[", Qs).registerInfix("(", zs).prefix("+", S.UnaryAdd, (r6, e) => new kt("+", e, (t) => t)).prefix("-", S.UnarySubtract, (r6, e) => new F("-", e, e, (t, n) => -n)).infixLeft(".", S.Dot, (r6, e, t) => new te(r6, t)).infixLeft("/", S.Divide, (r6, e, t) => new F("/", r6, t, (n, i) => n / i)).infixLeft("*", S.Multiply, (r6, e, t) => new F("*", r6, t, (n, i) => n * i)).infixLeft("+", S.Add, (r6, e, t) => new F("+", r6, t, (n, i) => n + i)).infixLeft("-", S.Subtract, (r6, e, t) => new F("-", r6, t, (n, i) => n - i)).infixLeft("|", S.Union, (r6, e, t) => new Ie(r6, t)).infixLeft("=", S.Equals, (r6, e, t) => new _t(r6, t)).infixLeft("!=", S.NotEquals, (r6, e, t) => new Lt(r6, t)).infixLeft("~", S.Equivalent, (r6, e, t) => new Nt(r6, t)).infixLeft("!~", S.NotEquivalent, (r6, e, t) => new Ft(r6, t)).infixLeft("<", S.LessThan, (r6, e, t) => new F("<", r6, t, (n, i) => n < i)).infixLeft("<=", S.LessThanOrEquals, (r6, e, t) => new F("<=", r6, t, (n, i) => n <= i)).infixLeft(">", S.GreaterThan, (r6, e, t) => new F(">", r6, t, (n, i) => n > i)).infixLeft(">=", S.GreaterThanOrEquals, (r6, e, t) => new F(">=", r6, t, (n, i) => n >= i)).infixLeft("&", S.Ampersand, (r6, e, t) => new Vt(r6, t)).infixLeft("and", S.And, (r6, e, t) => new Ut(r6, t)).infixLeft("as", S.As, (r6, e, t) => new ye(r6, t)).infixLeft("contains", S.Contains, (r6, e, t) => new Dt(r6, t)).infixLeft("div", S.Divide, (r6, e, t) => new F("div", r6, t, (n, i) => Math.trunc(n / i))).infixLeft("in", S.In, (r6, e, t) => new Mt(r6, t)).infixLeft("is", S.Is, (r6, e, t) => new ke(r6, t)).infixLeft("mod", S.Modulo, (r6, e, t) => new F("mod", r6, t, (n, i) => n % i)).infixLeft("or", S.Or, (r6, e, t) => new Bt(r6, t)).infixLeft("xor", S.Xor, (r6, e, t) => new Wt(r6, t)).infixLeft("implies", S.Implies, (r6, e, t) => new qt(r6, t));
 }
 var Ks = rt();
 var m = { EQUALS: "eq", NOT_EQUALS: "ne", GREATER_THAN: "gt", LESS_THAN: "lt", GREATER_THAN_OR_EQUALS: "ge", LESS_THAN_OR_EQUALS: "le", STARTS_AFTER: "sa", ENDS_BEFORE: "eb", APPROXIMATELY: "ap", CONTAINS: "contains", STARTS_WITH: "sw", EXACT: "exact", TEXT: "text", NOT: "not", ABOVE: "above", BELOW: "below", IN: "in", NOT_IN: "not-in", OF_TYPE: "of-type", MISSING: "missing", PRESENT: "present", IDENTIFIER: "identifier", ITERATE: "iterate" };
-var tn = { contains: m.CONTAINS, exact: m.EXACT, above: m.ABOVE, below: m.BELOW, text: m.TEXT, not: m.NOT, in: m.IN, "not-in": m.NOT_IN, "of-type": m.OF_TYPE, missing: m.MISSING, identifier: m.IDENTIFIER, iterate: m.ITERATE };
-var rn = { eq: m.EQUALS, ne: m.NOT_EQUALS, lt: m.LESS_THAN, le: m.LESS_THAN_OR_EQUALS, gt: m.GREATER_THAN, ge: m.GREATER_THAN_OR_EQUALS, sa: m.STARTS_AFTER, eb: m.ENDS_BEFORE, ap: m.APPROXIMATELY, sw: m.STARTS_WITH };
+var en = { contains: m.CONTAINS, exact: m.EXACT, above: m.ABOVE, below: m.BELOW, text: m.TEXT, not: m.NOT, in: m.IN, "not-in": m.NOT_IN, "of-type": m.OF_TYPE, missing: m.MISSING, identifier: m.IDENTIFIER, iterate: m.ITERATE };
+var tn = { eq: m.EQUALS, ne: m.NOT_EQUALS, lt: m.LESS_THAN, le: m.LESS_THAN_OR_EQUALS, gt: m.GREATER_THAN, ge: m.GREATER_THAN_OR_EQUALS, sa: m.STARTS_AFTER, eb: m.ENDS_BEFORE, ap: m.APPROXIMATELY, sw: m.STARTS_WITH };
 var ia = [m.MISSING, m.PRESENT];
 var fa = new K(1e3);
-var De = { READ: "read", VREAD: "vread", UPDATE: "update", DELETE: "delete", HISTORY: "history", CREATE: "create", SEARCH: "search" };
-var Pa = [De.READ, De.VREAD, De.HISTORY, De.SEARCH];
+var Me = { READ: "read", VREAD: "vread", UPDATE: "update", DELETE: "delete", HISTORY: "history", CREATE: "create", SEARCH: "search" };
+var Pa = [Me.READ, Me.VREAD, Me.HISTORY, Me.SEARCH];
 var af = { FIRST: "first", APPLICATION: "application" };
 function z() {
   return typeof window < "u";
 }
-function nn() {
+function rn() {
   return typeof Buffer < "u" ? Buffer : void 0;
 }
 var ce = { assign(r6) {
@@ -54032,7 +54045,7 @@ function Oa(r6) {
     let t = window.atob(r6), n = Uint8Array.from(t, (i) => i.codePointAt(0));
     return new window.TextDecoder().decode(n);
   }
-  let e = nn();
+  let e = rn();
   if (e) return e.from(r6, "base64").toString("utf-8");
   throw new Error("Unable to decode base64");
 }
@@ -54041,7 +54054,7 @@ function Gt(r6) {
     let t = new window.TextEncoder().encode(r6), n = String.fromCodePoint.apply(null, t);
     return window.btoa(n);
   }
-  let e = nn();
+  let e = rn();
   if (e) return e.from(r6, "utf8").toString("base64");
   throw new Error("Unable to encode base64");
 }
@@ -54050,7 +54063,7 @@ function Wi(r6) {
   let e = r6.replaceAll("-", "+").replaceAll("_", "/");
   return Oa(e);
 }
-function on() {
+function nn() {
   let r6 = new Uint32Array(28);
   return crypto.getRandomValues(r6), mi(r6.buffer);
 }
@@ -54064,7 +54077,7 @@ function ne() {
   });
 }
 var k = { 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", JWT: "application/jwt", MULTIPART_FORM_DATA: "multipart/form-data", 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", OCTET_STREAM: "application/octet-stream" };
-var sn = class {
+var on = class {
   constructor() {
     c(this, "listeners");
     this.listeners = {};
@@ -54095,7 +54108,7 @@ var sn = class {
 };
 var ie = class {
   constructor() {
-    c(this, "emitter", new sn());
+    c(this, "emitter", new on());
   }
   dispatchEvent(e) {
     this.emitter.dispatchEvent(e);
@@ -54113,14 +54126,14 @@ var ie = class {
     return this.emitter.listenerCount(e);
   }
 };
-var an = { "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 sn = { "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 Ba = ["Patient", "Encounter", "ImagingStudy", "DiagnosticReport", "OperationOutcome", "Bundle"];
-var cn = ["DiagnosticReport-update"];
+var an = ["DiagnosticReport-update"];
 function $i(r6) {
-  return cn.includes(r6);
+  return an.includes(r6);
 }
 function Hi(r6) {
-  if (cn.includes(r6)) throw new f(T(`'context.version' is required for '${r6}'.`));
+  if (an.includes(r6)) throw new f(T(`'context.version' is required for '${r6}'.`));
 }
 var Wa = { "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", reference: true }, patient: { resourceType: "Patient", optional: true, reference: true }, select: { resourceType: "*", reference: true, manyAllowed: true } }, "DiagnosticReport-update": { report: { resourceType: "DiagnosticReport", reference: true }, patient: { resourceType: "Patient", optional: true, reference: true }, updates: { resourceType: "Bundle" } }, syncerror: { operationoutcome: { resourceType: "OperationOutcome" } } };
 function qa(r6) {
@@ -54129,7 +54142,7 @@ function qa(r6) {
 function Gi(r6) {
   return !!r6.endpoint;
 }
-function un(r6) {
+function cn(r6) {
   if (!zt(r6)) throw new f(T("subscriptionRequest must be an object conforming to SubscriptionRequest type."));
   let { channelType: e, mode: t, topic: n, events: i } = r6, o2 = { "hub.channel.type": e, "hub.mode": t, "hub.topic": n, "hub.events": i.join(",") };
   return Gi(r6) && (o2.endpoint = r6.endpoint), new URLSearchParams(o2).toString();
@@ -54138,7 +54151,7 @@ function zt(r6) {
   if (typeof r6 != "object") return false;
   let { channelType: e, mode: t, topic: n, events: i } = r6;
   if (!(e && t && n && i) || typeof n != "string" || typeof i != "object" || !Array.isArray(i) || i.length < 1 || e !== "websocket" || t !== "subscribe" && t !== "unsubscribe") return false;
-  for (let o2 of i) if (!an[o2]) return false;
+  for (let o2 of i) if (!sn[o2]) return false;
   return !(Gi(r6) && !(typeof r6.endpoint == "string" && r6.endpoint.startsWith("ws")));
 }
 function ja(r6, e, t, n) {
@@ -54168,11 +54181,11 @@ function Ha(r6, e) {
     if (!o2.manyAllowed && (t.get(i) ?? 0) > 1) throw new f(T(`${t.get(i)} context entries with key '${i}' found for the '${r6}' event when schema only allows for 1.`));
   }
 }
-function ln(r6, e, t, n) {
+function un(r6, e, t, n) {
   if (!(r6 && typeof r6 == "string")) throw new f(T("Must provide a topic."));
-  if (!an[e]) throw new f(T(`Must provide a valid FHIRcast event name. Supported events: ${Object.keys(an).join(", ")}`));
+  if (!sn[e]) throw new f(T(`Must provide a valid FHIRcast event name. Supported events: ${Object.keys(sn).join(", ")}`));
   if (typeof t != "object") throw new f(T("context must be a context object or array of context objects."));
-  if (cn.includes(e) && !n) throw new f(T(`The '${e}' event must contain a 'context.versionId'.`));
+  if (an.includes(e) && !n) throw new f(T(`The '${e}' event must contain a 'context.versionId'.`));
   let i = Array.isArray(t) ? t : [t];
   return Ha(e, i), { timestamp: (/* @__PURE__ */ new Date()).toISOString(), id: ne(), event: { "hub.topic": r6, "hub.event": e, context: i, ...n ? { "context.versionId": n } : {} } };
 }
@@ -54282,7 +54295,7 @@ var ot = class {
   constructor(e, t = "") {
     c(this, "storage");
     c(this, "prefix", "");
-    this.storage = e ?? globalThis.localStorage ?? new dn(), this.prefix = t;
+    this.storage = e ?? globalThis.localStorage ?? new ln(), this.prefix = t;
   }
   makeKey(e) {
     return this.prefix + e;
@@ -54306,7 +54319,7 @@ var ot = class {
     this.setString(e, t ? At(t) : void 0);
   }
 };
-var dn = class {
+var ln = class {
   constructor() {
     c(this, "data");
     this.data = /* @__PURE__ */ new Map();
@@ -54357,7 +54370,7 @@ function za(r6, e) {
 function Yt(r6) {
   return new r6.constructor(r6.type, r6);
 }
-var Me = { 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 _e = { 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 Zi = false;
 var Xt = class r extends ie {
   constructor(t, n, i = {}) {
@@ -54382,7 +54395,7 @@ var Xt = class r extends ie {
     c(this, "onopen", null);
     c(this, "_handleOpen", (t2) => {
       this._debug("open event");
-      let { minUptime: n2 = Me.minUptime } = this._options;
+      let { minUptime: n2 = _e.minUptime } = this._options;
       clearTimeout(this._connectTimeout), this._uptimeTimeout = setTimeout(() => this._acceptOpen(), n2), za(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(Yt(t2));
     });
     c(this, "_handleMessage", (t2) => {
@@ -54464,7 +54477,7 @@ var Xt = class r extends ie {
   send(t) {
     if (this._ws?.readyState === this.OPEN) this._debug("send", t), this._ws.send(t);
     else {
-      let { maxEnqueuedMessages: n = Me.maxEnqueuedMessages } = this._options;
+      let { maxEnqueuedMessages: n = _e.maxEnqueuedMessages } = this._options;
       this._messageQueue.length < n && (this._debug("enqueue", t), this._messageQueue.push(t));
     }
   }
@@ -54472,7 +54485,7 @@ var Xt = class r extends ie {
     this._options.debug && this._debugLogger("RWS>", ...t);
   }
   _getNextDelay() {
-    let { reconnectionDelayGrowFactor: t = Me.reconnectionDelayGrowFactor, minReconnectionDelay: n = Me.minReconnectionDelay, maxReconnectionDelay: i = Me.maxReconnectionDelay } = this._options, o2 = 0;
+    let { reconnectionDelayGrowFactor: t = _e.reconnectionDelayGrowFactor, minReconnectionDelay: n = _e.minReconnectionDelay, maxReconnectionDelay: i = _e.maxReconnectionDelay } = this._options, o2 = 0;
     return this._retryCount > 0 && (o2 = n * Math.pow(t, this._retryCount - 1), o2 > i && (o2 = i)), this._debug("next delay", o2), o2;
   }
   _wait() {
@@ -54483,7 +54496,7 @@ var Xt = class r extends ie {
   _connect() {
     if (this._connectLock || !this._shouldReconnect) return;
     this._connectLock = true;
-    let { maxRetries: t = Me.maxRetries, connectionTimeout: n = Me.connectionTimeout } = this._options;
+    let { maxRetries: t = _e.maxRetries, connectionTimeout: n = _e.connectionTimeout } = this._options;
     if (this._retryCount >= t) {
       this._debug("max retries reached", this._retryCount, ">=", t);
       return;
@@ -54542,7 +54555,7 @@ var at = class extends ie {
     this.criteria.delete(t);
   }
 };
-var pn = class {
+var dn = class {
   constructor(e, t) {
     c(this, "criteria");
     c(this, "emitter");
@@ -54598,7 +54611,7 @@ var Zt = class {
           return;
         }
         if (o2.type === "handshake") {
-          let a = Ce(o2.subscription), u2 = { type: "connect", payload: { subscriptionId: a } };
+          let a = Pe(o2.subscription), u2 = { type: "connect", payload: { subscriptionId: a } };
           this.masterSubEmitter?.dispatchEvent(u2);
           let l = this.criteriaEntriesBySubscriptionId.get(a);
           if (!l) {
@@ -54609,7 +54622,7 @@ var Zt = class {
           return;
         }
         this.masterSubEmitter?.dispatchEvent({ type: "message", payload: i });
-        let s = this.criteriaEntriesBySubscriptionId.get(Ce(o2.subscription));
+        let s = this.criteriaEntriesBySubscriptionId.get(Pe(o2.subscription));
         if (!s) {
           console.warn("Received notification for criteria the SubscriptionManager is not listening for");
           return;
@@ -54622,7 +54635,7 @@ var Zt = class {
         for (let o2 of this.getAllCriteriaEmitters()) o2.dispatchEvent({ ...i });
       }
     }), e.addEventListener("error", (t) => {
-      let n = { type: "error", payload: new f({ resourceType: "OperationOutcome", issue: [{ severity: "error", code: "exception", details: { text: "WebSocket connection closed due to an error" }, diagnostics: t.error.toString() }] }) };
+      let n = { type: "error", payload: new f({ resourceType: "OperationOutcome", issue: [{ severity: "error", code: "exception", details: { text: "WebSocket connection closed due to an error" }, diagnostics: t.error ? Se(t.error) : t.message }] }) };
       this.masterSubEmitter?.dispatchEvent(n);
       for (let i of this.getAllCriteriaEmitters()) i.dispatchEvent({ ...n });
     }), e.addEventListener("close", () => {
@@ -54698,7 +54711,7 @@ var Zt = class {
     let e = [], t = [];
     for (let n of this.criteriaEntries.values()) for (let i of st(n)) i.refCount === 0 ? t.push(i) : e.push(i);
     for (let n of t) this.removeCriteriaEntry(n);
-    for (let n of e) n.token && this.sendUnbind(n.token), n.token = void 0, n.tokenExpiry = void 0, n.state = "idle", n.generation++, await this.subscribeToCriteria(n);
+    for (let n of e) n.token && this.sendUnbind(n.token), n.token = void 0, n.tokenExpiry = void 0, n.subscriptionId = void 0, n.state = "idle", n.generation++, await this.subscribeToCriteria(n);
   }
   async rebindCriteriaEntry(e) {
     let t = e.nextGeneration();
@@ -54714,7 +54727,7 @@ var Zt = class {
       if (this.isStale(e, t)) return;
       e.token = i, e.tokenExpiry = new Date(s).getTime(), this.criteriaEntriesBySubscriptionId.set(e.subscriptionId, e), this.sendBind(i);
     } catch (n) {
-      console.error(Ne(n)), e.generation === t && !this.isEntryGettingRemoved(e) && (e.state = e.state === "refreshing" ? "active" : "idle"), this.emitError(e, n);
+      console.error(Se(n)), e.generation === t && !this.isEntryGettingRemoved(e) && (e.state = e.state === "refreshing" ? "active" : "idle"), this.emitError(e, n);
     }
   }
   checkTokenExpirations() {
@@ -54728,7 +54741,7 @@ var Zt = class {
     this.masterSubEmitter && this.masterSubEmitter._addCriteria(e);
     let n = this.maybeGetCriteriaEntry(e, t);
     if (n) return n.refCount === 0 && (n.lastUnrefTime = void 0, n.generation++, n.state !== "active" && (n.state = n.token ? "active" : "idle")), n.refCount += 1, n.state === "idle" && this.subscribeToCriteria(n).catch(console.error), n.emitter;
-    let i = new pn(e, t);
+    let i = new dn(e, t);
     return this.addCriteriaEntry(i), this.subscribeToCriteria(i).catch(console.error), i.emitter;
   }
   removeCriteria(e, t) {
@@ -54779,7 +54792,7 @@ function st(r6) {
   return r6.bareCriteria ? [r6.bareCriteria, ...r6.criteriaWithProps] : r6.criteriaWithProps;
 }
 var Ka = new K(1e3);
-var fn = "5.1.15-088bfde";
+var pn = "5.1.17-3a68674";
 var Za = k.FHIR_JSON + ", */*; q=0.1";
 var ec = "https://api.medplum.com/";
 var tc = 1e3;
@@ -54833,7 +54846,7 @@ var er = class extends ie {
     c(this, "keyValueClient");
     c(this, "logLevel");
     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 ?? cc(), this.storage = t?.storage ?? new ot(void 0, t?.storagePrefix), this.createPdfImpl = t?.createPdf, this.baseUrl = Xr(t?.baseUrl ?? ec), this.fhirBaseUrl = U(this.baseUrl, t?.fhirUrlPath ?? "fhir/R4"), this.authorizeUrl = U(this.baseUrl, t?.authorizeUrl ?? "oauth2/authorize"), this.tokenUrl = U(this.baseUrl, t?.tokenUrl ?? "oauth2/token"), this.logoutUrl = U(this.baseUrl, t?.logoutUrl ?? "oauth2/logout"), this.fhircastHubUrl = U(this.baseUrl, t?.fhircastHubUrl ?? "fhircast/STU3"), this.cdsServicesUrl = U(this.baseUrl, t?.cdsServicesUrl ?? "cds-services"), this.clientId = t?.clientId ?? "", this.clientSecret = t?.clientSecret ?? "", this.credentialsInHeader = t?.authCredentialsMethod === "header", this.defaultHeaders = t?.defaultHeaders ?? {}, this.onUnauthenticated = t?.onUnauthenticated, this.refreshGracePeriod = t?.refreshGracePeriod ?? ic, this.logLevel = this.initializeLogLevel(t), this.maxRetries = t?.maxRetries ?? 2, this.maxRetryTime = t?.maxRetryTime ?? 2e3, this.cacheTime = t?.cacheTime ?? (z() ? rc : nc), this.cacheTime > 0 ? this.requestCache = new K(t?.resourceCacheSize ?? tc) : 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 ?? cc(), this.storage = t?.storage ?? new ot(void 0, t?.storagePrefix), this.createPdfImpl = t?.createPdf, this.baseUrl = Yr(t?.baseUrl ?? ec), this.fhirBaseUrl = U(this.baseUrl, t?.fhirUrlPath ?? "fhir/R4"), this.authorizeUrl = U(this.baseUrl, t?.authorizeUrl ?? "oauth2/authorize"), this.tokenUrl = U(this.baseUrl, t?.tokenUrl ?? "oauth2/token"), this.logoutUrl = U(this.baseUrl, t?.logoutUrl ?? "oauth2/logout"), this.fhircastHubUrl = U(this.baseUrl, t?.fhircastHubUrl ?? "fhircast/STU3"), this.cdsServicesUrl = U(this.baseUrl, t?.cdsServicesUrl ?? "cds-services"), this.clientId = t?.clientId ?? "", this.clientSecret = t?.clientSecret ?? "", this.credentialsInHeader = t?.authCredentialsMethod === "header", this.defaultHeaders = t?.defaultHeaders ?? {}, this.onUnauthenticated = t?.onUnauthenticated, this.refreshGracePeriod = t?.refreshGracePeriod ?? ic, this.logLevel = this.initializeLogLevel(t), this.maxRetries = t?.maxRetries ?? 2, this.maxRetryTime = t?.maxRetryTime ?? 2e3, this.cacheTime = t?.cacheTime ?? (z() ? rc : nc), this.cacheTime > 0 ? this.requestCache = new K(t?.resourceCacheSize ?? tc) : 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 } });
@@ -55076,8 +55089,8 @@ var er = class extends ie {
         target
       }
     }`.replaceAll(/\s+/g, " "), u2 = await this.graphql(a);
-      Or(u2.data.StructureDefinitionList);
-      for (let l of u2.data.SearchParameterList) en(l);
+      wr(u2.data.StructureDefinitionList);
+      for (let l of u2.data.SearchParameterList) Zr(l);
     })());
     return this.setCacheEntry(i, s, n), s;
   }
@@ -55090,14 +55103,14 @@ var er = class extends ie {
         let a = this.fhirUrl("StructureDefinition", "$expand-profile");
         a.search = new URLSearchParams({ url: t }).toString();
         let u2 = await this.post(a.toString(), {});
-        Or(u2);
+        wr(u2);
       } else {
         let a = await this.searchOne("StructureDefinition", { url: t, _sort: "-_lastUpdated" });
         if (!a) {
           console.warn(`No StructureDefinition found for ${t}!`);
           return;
         }
-        Ir(a);
+        Or(a);
       }
     })());
     return this.setCacheEntry(i, s, n), s;
@@ -55174,7 +55187,7 @@ var er = class extends ie {
   }
   createComment(t, n, i) {
     let o2 = this.getProfile(), s, a;
-    return t.resourceType === "Encounter" && (s = Re(t), a = t.subject), t.resourceType === "ServiceRequest" && (s = t.encounter, a = t.subject), t.resourceType === "Patient" && (a = Re(t)), this.createResource({ resourceType: "Communication", status: "completed", basedOn: [Re(t)], encounter: s, subject: a, sender: o2 ? Re(o2) : void 0, sent: (/* @__PURE__ */ new Date()).toISOString(), payload: [{ contentString: n }] }, i);
+    return t.resourceType === "Encounter" && (s = Ce(t), a = t.subject), t.resourceType === "ServiceRequest" && (s = t.encounter, a = t.subject), t.resourceType === "Patient" && (a = Ce(t)), this.createResource({ resourceType: "Communication", status: "completed", basedOn: [Ce(t)], encounter: s, subject: a, sender: o2 ? Ce(o2) : void 0, sent: (/* @__PURE__ */ new Date()).toISOString(), payload: [{ contentString: n }] }, i);
   }
   async updateResource(t, n) {
     if (!t.resourceType) throw new Error("Missing resourceType");
@@ -55217,7 +55230,7 @@ var er = class extends ie {
   }
   pushToAgent(t, n, i, o2, s, a) {
     let { waitTimeout: u2, returnAck: l, ...p2 } = a ?? {};
-    return this.post(this.fhirUrl("Agent", Ce(t), "$push"), { destination: typeof n == "string" ? n : O(n), body: i, contentType: o2, waitForResponse: s, ...u2 !== void 0 ? { waitTimeout: u2 } : void 0, ...l !== void 0 ? { returnAck: l } : void 0 }, k.FHIR_JSON, p2);
+    return this.post(this.fhirUrl("Agent", Pe(t), "$push"), { destination: typeof n == "string" ? n : O(n), body: i, contentType: o2, waitForResponse: s, ...u2 !== void 0 ? { waitTimeout: u2 } : void 0, ...l !== void 0 ? { returnAck: l } : void 0 }, k.FHIR_JSON, p2);
   }
   getCdsServices(t) {
     return this.get(this.cdsServicesUrl, t);
@@ -55252,10 +55265,16 @@ var er = class extends ie {
       this.get("auth/me", { cache: "no-cache" }).then((i) => {
         this.profilePromise = void 0;
         let o2 = this.sessionDetails?.profile?.id !== i.profile.id;
-        this.sessionDetails = i, o2 && this.dispatchEvent({ type: "change" }), t(i.profile), this.dispatchEvent({ type: "profileRefreshed" });
+        this.sessionDetails = i, this.syncStoredLoginProject(), o2 && this.dispatchEvent({ type: "change" }), t(i.profile), this.dispatchEvent({ type: "profileRefreshed" });
       }).catch(n);
     }), this.dispatchEvent({ type: "profileRefreshing" }), this.profilePromise;
   }
+  syncStoredLoginProject() {
+    let t = this.getActiveLogin(), n = this.sessionDetails?.project?.name;
+    if (!t || !n || t.project.display === n) return;
+    let i = { ...t, project: { ...t.project, display: n } };
+    this.storage.setObject("activeLogin", i), this.addLogin(i);
+  }
   isLoading() {
     return !this.isInitialized || !!this.profilePromise && !this.sessionDetails?.profile;
   }
@@ -55295,7 +55314,7 @@ var er = class extends ie {
   }
   async createMedia(t, n) {
     let { additionalFields: i, ...o2 } = t, s = await this.createResource({ resourceType: "Media", status: "preparation", content: { contentType: t.contentType }, ...i });
-    o2.securityContext || (o2.securityContext = Re(s));
+    o2.securityContext || (o2.securityContext = Ce(s));
     let a = await this.createAttachment(o2, n);
     return this.updateResource({ ...s, status: "completed", content: a });
   }
@@ -55304,7 +55323,7 @@ var er = class extends ie {
   }
   async createDocumentReference(t, n) {
     let { additionalFields: i, ...o2 } = t, s = await this.createResource({ resourceType: "DocumentReference", status: "current", content: [{ attachment: { contentType: t.contentType } }], ...i });
-    o2.securityContext || (o2.securityContext = Re(s));
+    o2.securityContext || (o2.securityContext = Ce(s));
     let a = await this.createAttachment(o2, n);
     return this.updateResource({ ...s, content: [{ attachment: a }] });
   }
@@ -55388,7 +55407,7 @@ var er = class extends ie {
       if (this.logLevel !== "none" && this.logResponse(s), this.setCurrentRateLimit(s), o2 >= i || !pc(s)) return s;
       let a = this.getRetryDelay(o2), u2 = n.maxRetryTime ?? this.maxRetryTime;
       if (a > u2) return s;
-      await Yr(a, { signal: n.signal });
+      await Kr(a, { signal: n.signal });
     } catch (s) {
       if (s.message === "Failed to fetch" && o2 === 0 && this.dispatchEvent({ type: "offline" }), s.name === "AbortError" || o2 === i) throw s;
     }
@@ -55429,7 +55448,7 @@ var er = class extends ie {
     if (i.pollCount === void 0) n.headers && typeof n.headers == "object" && "Prefer" in n.headers && (o2.headers = { ...n.headers }, delete o2.headers.Prefer), i.statusUrl = t, i.pollCount = 1;
     else {
       let s = n.pollStatusPeriod ?? 1e3;
-      await Yr(s, { signal: n.signal }), i.pollCount++;
+      await Kr(s, { signal: n.signal }), i.pollCount++;
     }
     return this.request(t, { ...n, method: "GET" }, i);
   }
@@ -55448,7 +55467,7 @@ var er = class extends ie {
     let n = { resourceType: "Bundle", type: "batch", entry: t.map((o2) => ({ request: { method: o2.method, url: o2.url }, resource: o2.options.body ? JSON.parse(o2.options.body) : void 0 })) }, i = await this.post(this.fhirBaseUrl, n);
     for (let o2 = 0; o2 < t.length; o2++) {
       let s = t[o2], a = i.entry?.[o2];
-      a?.response?.outcome && !Er(a.response.outcome) ? s.reject(new f(a.response.outcome)) : s.resolve(a?.resource);
+      a?.response?.outcome && !br(a.response.outcome) ? s.reject(new f(a.response.outcome)) : s.resolve(a?.resource);
     }
   }
   addFetchOptionsDefaults(t) {
@@ -55479,12 +55498,12 @@ var er = class extends ie {
   }
   handleUnauthenticated(t, n) {
     if (this.refresh()) return this.request(t, n);
-    throw this.clear(), this.onUnauthenticated?.(), new f(Le);
+    throw this.clear(), this.onUnauthenticated?.(), new f(Ne);
   }
   async startPkce() {
-    let t = on();
+    let t = nn();
     this.storage.setString("pkceState", t);
-    let n = on().slice(0, 128);
+    let n = nn().slice(0, 128);
     this.storage.setString("codeVerifier", n);
     try {
       let i = await qi(n);
@@ -55541,20 +55560,20 @@ var er = class extends ie {
   async fhircastSubscribe(t, n) {
     if (!(typeof t == "string" && t !== "")) throw new f(T("Invalid topic provided. Topic must be a valid string."));
     if (!(typeof n == "object" && Array.isArray(n) && n.length > 0)) throw new f(T("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, un(i), k.FORM_URL_ENCODED))["hub.channel.endpoint"];
+    let i = { channelType: "websocket", mode: "subscribe", topic: t, events: n }, s = (await this.post(this.fhircastHubUrl, cn(i), k.FORM_URL_ENCODED))["hub.channel.endpoint"];
     if (!s) throw new Error("Invalid response!");
     return i.endpoint = s, i;
   }
   async fhircastUnsubscribe(t) {
     if (!zt(t)) throw new f(T("Invalid topic or subscriptionRequest. SubscriptionRequest must be an object."));
     if (!(t.endpoint && typeof t.endpoint == "string" && t.endpoint.startsWith("ws"))) throw new f(T("Provided subscription request must have an endpoint in order to unsubscribe."));
-    t.mode = "unsubscribe", await this.post(this.fhircastHubUrl, un(t), k.FORM_URL_ENCODED);
+    t.mode = "unsubscribe", await this.post(this.fhircastHubUrl, cn(t), k.FORM_URL_ENCODED);
   }
   fhircastConnect(t) {
     return new Qt(t);
   }
   async fhircastPublish(t, n, i, o2) {
-    return $i(n) ? this.post(this.fhircastHubUrl, ln(t, n, i, o2), k.JSON) : (Hi(n), this.post(this.fhircastHubUrl, ln(t, n, i), k.JSON));
+    return $i(n) ? this.post(this.fhircastHubUrl, un(t, n, i, o2), k.JSON) : (Hi(n), this.post(this.fhircastHubUrl, un(t, n, i), k.JSON));
   }
   async fhircastGetContext(t) {
     return this.get(`${this.fhircastHubUrl}/${t}`, { cache: "no-cache" });
@@ -55589,8 +55608,8 @@ var er = class extends ie {
       let i = Jt(n);
       if (Date.now() >= i.exp * 1e3) throw this.clearActiveLogin(), new f(Un);
       if (i.cid) {
-        if (i.cid !== this.clientId) throw this.clearActiveLogin(), new f(Sr);
-      } else if (this.clientId && i.client_id !== this.clientId) throw this.clearActiveLogin(), new f(Sr);
+        if (i.cid !== this.clientId) throw this.clearActiveLogin(), new f(Tr);
+      } else if (this.clientId && i.client_id !== this.clientId) throw this.clearActiveLogin(), new f(Tr);
     }
     return this.setActiveLogin({ accessToken: n, refreshToken: t.refresh_token, project: t.project, profile: t.profile });
   }
@@ -55924,7 +55943,7 @@ var Po = class r5 {
   log(e, t, n) {
     if (e > this.level) return;
     let i;
-    if (br(n)) i = lr(n);
+    if (Sr(n)) i = lr(n);
     else if (n) {
       i = { ...n };
       for (let [o2, s] of Object.entries(i)) s instanceof Error && (i[o2] = lr(s));
@@ -55950,12 +55969,12 @@ function lr(r6, e = 0, t = 10) {
   }
   return n;
 }
-var Pn = `${ft}/fhir/StructureDefinition/patient-preferredPharmacy`;
+var Cn = `${ft}/fhir/StructureDefinition/patient-preferredPharmacy`;
 var bu = "https://meta.medplum.com/releases";
-var fr = /* @__PURE__ */ new Map();
+var An = /* @__PURE__ */ new Map();
 function Eu(r6) {
   let e = r6;
-  if (!e.tag_name) throw new Error("Manifest missing tag_name");
+  if (!e.tag_name?.startsWith("v")) throw new Error("Manifest missing valid tag_name starting with a 'v' (eg. v5.1.15)");
   let t = e.assets;
   if (!t?.length) throw new Error("Manifest missing assets list");
   for (let n of t) {
@@ -55964,22 +55983,22 @@ function Eu(r6) {
   }
 }
 async function wn(r6, e, t) {
-  let n = fr.get(e ?? "latest");
+  let n = e ? An.get(e) : void 0;
   if (!n) {
     let i = e ? `v${e}` : "latest", o2 = new URL(`${bu}/${i}.json`);
-    if (o2.searchParams.set("a", r6), o2.searchParams.set("c", fn), t) for (let [u2, l] of Object.entries(t)) o2.searchParams.set(u2, l);
+    if (o2.searchParams.set("a", r6), o2.searchParams.set("c", pn), t) for (let [u2, l] of Object.entries(t)) o2.searchParams.set(u2, l);
     let s = await fetch(o2.toString());
     if (s.status !== 200) {
       let u2;
       try {
         u2 = (await s.json()).message;
       } catch (l) {
-        console.error(`Failed to parse message from body: ${Ne(l)}`);
+        console.error(`Failed to parse message from body: ${Se(l)}`);
       }
       throw new Error(`Received status code ${s.status} while fetching manifest for version '${e ?? "latest"}'. Message: ${u2}`);
     }
     let a = await s.json();
-    Eu(a), n = a, fr.set(e ?? "latest", n), e || fr.set(n.tag_name.slice(1), n);
+    Eu(a), n = a, An.set(n.tag_name.slice(1), n);
   }
   return n;
 }
@@ -56122,7 +56141,7 @@ var v = class extends m2 {
       for (this.responseQueueProcessing = true; this.responseQueue.length; ) {
         if (this.messagesPerMin) {
           let t = B2 / this.messagesPerMin, s = Date.now() - this.lastMessageDispatchedTime;
-          t > s && await Yr(t - s);
+          t > s && await Kr(t - s);
         }
         let e = this.responseQueue.shift();
         e && this.dispatchEvent(e), this.lastMessageDispatchedTime = Date.now();
@@ -56334,7 +56353,7 @@ var x = class {
           c2(T2);
         });
       }, h2 = (l) => {
-        l?.code === "EADDRINUSE" ? n.close(() => Yr(50).then(() => a(i))) : r6(l);
+        l?.code === "EADDRINUSE" ? n.close(() => Kr(50).then(() => a(i))) : r6(l);
       };
       n.on("error", h2), n.once("listening", () => {
         n.off("error", h2);
@@ -56608,7 +56627,7 @@ var ByteStreamChannelConnection = class {
       }
     } catch (err2) {
       this.channel.log.error(`Byte stream error occurred - check channel logs`);
-      this.channel.channelLog.error(`Byte stream error: ${Ne(err2)}`);
+      this.channel.channelLog.error(`Byte stream error: ${Se(err2)}`);
     }
   }
   write(data2) {
@@ -57337,11 +57356,11 @@ function asyncGeneratorStep(gen, resolve2, reject, _next, _throw, key, arg) {
     Promise.resolve(value).then(_next, _throw);
   }
 }
-function _asyncToGenerator(fn2) {
+function _asyncToGenerator(fn) {
   return function() {
     var self2 = this, args = arguments;
     return new Promise(function(resolve2, reject) {
-      var gen = fn2.apply(self2, args);
+      var gen = fn.apply(self2, args);
       function _next(value) {
         asyncGeneratorStep(gen, resolve2, reject, _next, _throw, "next", value);
       }
@@ -62424,9 +62443,9 @@ var BufferStream = /* @__PURE__ */ (function() {
   }, {
     key: "readVR",
     value: function readVR() {
-      var vr = String.fromCharCode(this.view.getUint8(this.offset)) + String.fromCharCode(this.view.getUint8(this.offset + 1));
+      var vr2 = String.fromCharCode(this.view.getUint8(this.offset)) + String.fromCharCode(this.view.getUint8(this.offset + 1));
       this.increment(2);
-      return vr;
+      return vr2;
     }
   }, {
     key: "readEncodedString",
@@ -63369,20 +63388,20 @@ var ValueRepresentation = /* @__PURE__ */ (function() {
   }, {
     key: "createByTypeString",
     value: function createByTypeString(type) {
-      var vr = VRinstances[type];
-      if (vr === void 0) {
+      var vr2 = VRinstances[type];
+      if (vr2 === void 0) {
         if (type == "ox") {
           validationLog.error("Invalid vr type", type, "- using OW");
-          vr = VRinstances["OW"];
+          vr2 = VRinstances["OW"];
         } else if (type == "xs") {
           validationLog.error("Invalid vr type", type, "- using US");
-          vr = VRinstances["US"];
+          vr2 = VRinstances["US"];
         } else {
           validationLog.error("Invalid vr type", type, "- using UN");
-          vr = VRinstances["UN"];
+          vr2 = VRinstances["UN"];
         }
       }
-      return vr;
+      return vr2;
     }
   }, {
     key: "parseUnknownVr",
@@ -64468,10 +64487,10 @@ var UnknownValue = /* @__PURE__ */ (function(_BinaryRepresentation) {
 })(BinaryRepresentation);
 var ParsedUnknownValue = /* @__PURE__ */ (function(_BinaryRepresentation2) {
   _inherits(ParsedUnknownValue2, _BinaryRepresentation2);
-  function ParsedUnknownValue2(vr) {
+  function ParsedUnknownValue2(vr2) {
     var _this28;
     _classCallCheck(this, ParsedUnknownValue2);
-    _this28 = _callSuper(this, ParsedUnknownValue2, [vr]);
+    _this28 = _callSuper(this, ParsedUnknownValue2, [vr2]);
     _this28.maxLength = null;
     _this28.padByte = 0;
     _this28.noMultiple = true;
@@ -64486,13 +64505,13 @@ var ParsedUnknownValue = /* @__PURE__ */ (function(_BinaryRepresentation2) {
     value: function read(stream, length2, syntax, readOptions) {
       var arrayBuffer = this.readBytes(stream, length2, syntax)[0];
       var streamFromBuffer = new ReadBufferStream(arrayBuffer, true);
-      var vr = ValueRepresentation.createByTypeString(this.type);
-      if (vr.isBinary() && length2 > vr.maxLength && !vr.noMultiple) {
+      var vr2 = ValueRepresentation.createByTypeString(this.type);
+      if (vr2.isBinary() && length2 > vr2.maxLength && !vr2.noMultiple) {
         var values = [];
         var rawValues = [];
-        var times = length2 / vr.maxLength, i = 0;
+        var times = length2 / vr2.maxLength, i = 0;
         while (i++ < times) {
-          var _vr$read = vr.read(streamFromBuffer, vr.maxLength, syntax, readOptions), rawValue = _vr$read.rawValue, value = _vr$read.value;
+          var _vr$read = vr2.read(streamFromBuffer, vr2.maxLength, syntax, readOptions), rawValue = _vr$read.rawValue, value = _vr$read.value;
           rawValues.push(rawValue);
           values.push(value);
         }
@@ -64501,7 +64520,7 @@ var ParsedUnknownValue = /* @__PURE__ */ (function(_BinaryRepresentation2) {
           value: values
         };
       } else {
-        return vr.read(streamFromBuffer, length2, syntax, readOptions);
+        return vr2.read(streamFromBuffer, length2, syntax, readOptions);
       }
     }
   }]);
@@ -64601,12 +64620,12 @@ var DicomDict = /* @__PURE__ */ (function() {
   }
   _createClass(DicomDict2, [{
     key: "upsertTag",
-    value: function upsertTag(tag, vr, values) {
+    value: function upsertTag(tag, vr2, values) {
       if (this.dict[tag]) {
         this.dict[tag].Value = values;
       } else {
         this.dict[tag] = ValueRepresentation.addTagAccessors({
-          vr
+          vr: vr2
         });
         this.dict[tag].Value = values;
       }
@@ -65221,13 +65240,13 @@ function lookupTagHex(hex8) {
   var end = gi2 + 1 < groupStart.length ? groupStart[gi2 + 1] : elems.length;
   var ei2 = _binSearchU16(elems, start, end, elem);
   if (ei2 < 0) return void 0;
-  var vr = vrTable$1[vrCode[ei2]];
+  var vr2 = vrTable$1[vrCode[ei2]];
   var vm = vmTable$1[vmCode[ei2]];
   var off = nameOff[ei2];
   var len2 = nameLen[ei2];
   var name = nameBlob$1.slice(off, off + len2);
   return {
-    vr,
+    vr: vr2,
     vm,
     name
   };
@@ -65264,14 +65283,14 @@ function getAllStandardTagEntries() {
       var elem = elems[ei2];
       var eHex = _pad4(elem.toString(16).toUpperCase());
       var tag = "(" + gHex + "," + eHex + ")";
-      var vr = vrTable$1[vrCode[ei2]];
+      var vr2 = vrTable$1[vrCode[ei2]];
       var vm = vmTable$1[vmCode[ei2]];
       var off = nameOff[ei2];
       var len2 = nameLen[ei2];
       var name = nameBlob$1.slice(off, off + len2);
       out.push({
         tag,
-        vr,
+        vr: vr2,
         vm,
         name
       });
@@ -65595,9 +65614,9 @@ var DicomMetaDictionary = /* @__PURE__ */ (function() {
           if (dataValue === void 0) {
             return;
           }
-          var vr = dataset._vrMap && dataset._vrMap[naturalName] ? dataset._vrMap[naturalName] : entry.vr;
+          var vr2 = dataset._vrMap && dataset._vrMap[naturalName] ? dataset._vrMap[naturalName] : entry.vr;
           var dataItem = ValueRepresentation.addTagAccessors({
-            vr
+            vr: vr2
           });
           dataItem.Value = dataset[naturalName];
           if (dataValue !== null) {
@@ -65851,7 +65870,7 @@ var Tag = /* @__PURE__ */ (function() {
   }, {
     key: "write",
     value: function write(stream, vrType, values, syntax, writeOptions) {
-      var vr = ValueRepresentation.createByTypeString(vrType);
+      var vr2 = ValueRepresentation.createByTypeString(vrType);
       var useSyntax = DicomMessage$1._normalizeSyntax(syntax);
       var implicit = useSyntax === IMPLICIT_LITTLE_ENDIAN;
       var isLittleEndian = useSyntax === IMPLICIT_LITTLE_ENDIAN || useSyntax === EXPLICIT_LITTLE_ENDIAN$1;
@@ -65863,11 +65882,11 @@ var Tag = /* @__PURE__ */ (function() {
       var tagStream = new WriteBufferStream(256), valueLength;
       tagStream.setEndian(isLittleEndian);
       if (vrType == "OW" || vrType == "OB" || vrType == "UN") {
-        valueLength = vr.writeBytes(tagStream, values, useSyntax, isEncapsulated, writeOptions);
+        valueLength = vr2.writeBytes(tagStream, values, useSyntax, isEncapsulated, writeOptions);
       } else if (vrType == "SQ") {
-        valueLength = vr.writeBytes(tagStream, values, useSyntax, writeOptions);
+        valueLength = vr2.writeBytes(tagStream, values, useSyntax, writeOptions);
       } else {
-        valueLength = vr.writeBytes(tagStream, values, writeOptions);
+        valueLength = vr2.writeBytes(tagStream, values, writeOptions);
       }
       if (vrType == "SQ") {
         valueLength = UNDEFINED_LENGTH;
@@ -65877,14 +65896,14 @@ var Tag = /* @__PURE__ */ (function() {
         stream.writeUint32(valueLength);
         written += 4;
       } else {
-        var isBig16Length = !vr.isLength32() && valueLength >= 65536 && valueLength !== UNDEFINED_LENGTH;
-        if (vr.isLength32() || isBig16Length) {
-          stream.writeAsciiString(isBig16Length ? "UN" : vr.type);
+        var isBig16Length = !vr2.isLength32() && valueLength >= 65536 && valueLength !== UNDEFINED_LENGTH;
+        if (vr2.isLength32() || isBig16Length) {
+          stream.writeAsciiString(isBig16Length ? "UN" : vr2.type);
           stream.writeUint16(0);
           stream.writeUint32(valueLength);
           written += 8;
         } else {
-          stream.writeAsciiString(vr.type);
+          stream.writeAsciiString(vr2.type);
           stream.writeUint16(valueLength);
           written += 4;
         }
@@ -66119,9 +66138,9 @@ var DicomMessage = /* @__PURE__ */ (function() {
     }
   }, {
     key: "writeTagObject",
-    value: function writeTagObject(stream, tagString, vr, values, syntax, writeOptions) {
+    value: function writeTagObject(stream, tagString, vr2, values, syntax, writeOptions) {
       var tag = Tag.fromString(tagString);
-      tag.write(stream, vr, values, syntax, writeOptions);
+      tag.write(stream, vr2, values, syntax, writeOptions);
     }
   }, {
     key: "write",
@@ -66141,14 +66160,14 @@ var DicomMessage = /* @__PURE__ */ (function() {
       if (!tagObject._rawValue) {
         return tagObject.Value;
       }
-      var vr = ValueRepresentation.createByTypeString(vrType);
+      var vr2 = ValueRepresentation.createByTypeString(vrType);
       var originalValue;
       if (Array.isArray(tagObject._rawValue)) {
         originalValue = tagObject._rawValue.map(function(val) {
-          return vr.applyFormatting(val);
+          return vr2.applyFormatting(val);
         });
       } else {
-        originalValue = vr.applyFormatting(tagObject._rawValue);
+        originalValue = vr2.applyFormatting(tagObject._rawValue);
       }
       if (deepEqual(tagObject.Value, originalValue)) {
         return tagObject._rawValue;
@@ -66177,7 +66196,7 @@ var DicomMessage = /* @__PURE__ */ (function() {
           };
         }
       }
-      var length2 = null, vr = null, vrType;
+      var length2 = null, vr2 = null, vrType;
       if (implicit) {
         length2 = stream.readUint32();
         var elementData = DicomMessage2.lookupTag(tag);
@@ -66196,16 +66215,16 @@ var DicomMessage = /* @__PURE__ */ (function() {
             vrType = "UN";
           }
         }
-        vr = ValueRepresentation.createByTypeString(vrType);
+        vr2 = ValueRepresentation.createByTypeString(vrType);
       } else {
         vrType = stream.readVR();
         if (vrType === "UN" && DicomMessage2.lookupTag(tag) && DicomMessage2.lookupTag(tag).vr) {
           vrType = DicomMessage2.lookupTag(tag).vr;
-          vr = ValueRepresentation.parseUnknownVr(vrType);
+          vr2 = ValueRepresentation.parseUnknownVr(vrType);
         } else {
-          vr = ValueRepresentation.createByTypeString(vrType);
+          vr2 = ValueRepresentation.createByTypeString(vrType);
         }
-        if (vr.isLength32()) {
+        if (vr2.isLength32()) {
           stream.increment(2);
           length2 = stream.readUint32();
         } else {
@@ -66214,27 +66233,27 @@ var DicomMessage = /* @__PURE__ */ (function() {
       }
       var values = [];
       var rawValues = [];
-      if (vr.isBinary() && length2 > vr.maxLength && !vr.noMultiple) {
-        var times = length2 / vr.maxLength, i = 0;
+      if (vr2.isBinary() && length2 > vr2.maxLength && !vr2.noMultiple) {
+        var times = length2 / vr2.maxLength, i = 0;
         while (i++ < times) {
-          var _vr$read = vr.read(stream, vr.maxLength, syntax, options), rawValue = _vr$read.rawValue, value = _vr$read.value;
+          var _vr$read = vr2.read(stream, vr2.maxLength, syntax, options), rawValue = _vr$read.rawValue, value = _vr$read.value;
           rawValues.push(rawValue);
           values.push(value);
         }
       } else {
-        var _ref = vr.read(stream, length2, syntax, options) || {}, _rawValue = _ref.rawValue, _value = _ref.value;
-        if (!vr.isBinary() && singleVRs.indexOf(vr.type) == -1) {
+        var _ref = vr2.read(stream, length2, syntax, options) || {}, _rawValue = _ref.rawValue, _value = _ref.value;
+        if (!vr2.isBinary() && singleVRs.indexOf(vr2.type) == -1) {
           rawValues = _rawValue;
           values = _value;
           if (typeof _value === "string") {
             var delimiterChar = String.fromCharCode(VM_DELIMITER);
-            rawValues = vr.dropPadByte(_rawValue.split(delimiterChar));
-            values = vr.dropPadByte(_value.split(delimiterChar));
+            rawValues = vr2.dropPadByte(_rawValue.split(delimiterChar));
+            values = vr2.dropPadByte(_value.split(delimiterChar));
           }
-        } else if (vr.type == "SQ") {
+        } else if (vr2.type == "SQ") {
           rawValues = _rawValue;
           values = _value;
-        } else if (vr.type == "OW" || vr.type == "OB") {
+        } else if (vr2.type == "OW" || vr2.type == "OB") {
           rawValues = _rawValue;
           values = _value;
         } else {
@@ -66245,7 +66264,7 @@ var DicomMessage = /* @__PURE__ */ (function() {
       stream.setEndian(oldEndian);
       var retObj = ValueRepresentation.addTagAccessors({
         tag,
-        vr
+        vr: vr2
       });
       retObj.values = values;
       retObj.rawValues = rawValues;
@@ -66316,13 +66335,13 @@ function lookupPrivateTag(keyStr) {
     if (keyStr < candidate) hi2 = mid - 1;
     else if (keyStr > candidate) lo = mid + 1;
     else {
-      var vr = vrTable[vrCode[mid]];
+      var vr2 = vrTable[vrCode[mid]];
       var vm = vmTable[vmCode[mid]];
       var off = nameOff[mid];
       var nlen = nameLen[mid];
       var name = nameBlob.slice(off, off + nlen);
       return {
-        vr,
+        vr: vr2,
         vm,
         name
       };
@@ -66550,8 +66569,8 @@ var DicomMetadataListener = /* @__PURE__ */ (function() {
        *
        * @param {(() => Promise<void>) | null} fn - Function that returns a Promise, or null to clear
        */
-      function setDrain(fn2) {
-        this._drain = typeof fn2 === "function" ? fn2 : null;
+      function setDrain(fn) {
+        this._drain = typeof fn === "function" ? fn : null;
       }
     )
     /**
@@ -67544,8 +67563,8 @@ var AsyncDicomReader = /* @__PURE__ */ (function() {
   }, {
     key: "isSequence",
     value: function isSequence(tagInfo) {
-      var vr = tagInfo.vr, length2 = tagInfo.length;
-      return vr === "SQ" || vr === "UN" && length2 === UNDEFINED_LENGTH_FIX;
+      var vr2 = tagInfo.vr, length2 = tagInfo.length;
+      return vr2 === "SQ" || vr2 === "UN" && length2 === UNDEFINED_LENGTH_FIX;
     }
     /**
      * Reads a tag header.
@@ -67576,12 +67595,12 @@ var AsyncDicomReader = /* @__PURE__ */ (function() {
         }
       }
       var length2 = null;
-      var vr = null;
+      var vr2 = null;
       var vrType;
       var isCommand = tagObj.group() === 0;
       if (tagObj.isInstruction()) {
         length2 = stream.readUint32();
-        vr = ValueRepresentation.createByTypeString("UN");
+        vr2 = ValueRepresentation.createByTypeString("UN");
       } else if (implicit && !isCommand) {
         length2 = stream.readUint32();
         var elementData = DicomMessage.lookupTag(tagObj);
@@ -67602,17 +67621,17 @@ var AsyncDicomReader = /* @__PURE__ */ (function() {
             vrType = "UN";
           }
         }
-        vr = ValueRepresentation.createByTypeString(vrType);
+        vr2 = ValueRepresentation.createByTypeString(vrType);
       } else {
         var _DicomMessage$lookupT;
         vrType = stream.readVR();
         if (vrType === "UN" && (_DicomMessage$lookupT = DicomMessage.lookupTag(tagObj)) !== null && _DicomMessage$lookupT !== void 0 && _DicomMessage$lookupT.vr) {
           vrType = DicomMessage.lookupTag(tagObj).vr;
-          vr = ValueRepresentation.parseUnknownVr(vrType);
+          vr2 = ValueRepresentation.parseUnknownVr(vrType);
         } else {
-          vr = ValueRepresentation.createByTypeString(vrType);
+          vr2 = ValueRepresentation.createByTypeString(vrType);
         }
-        if (vr.isLength32()) {
+        if (vr2.isLength32()) {
           stream.increment(2);
           length2 = stream.readUint32();
         } else {
@@ -67622,8 +67641,8 @@ var AsyncDicomReader = /* @__PURE__ */ (function() {
       var punctuatedTag = DicomMetaDictionary.punctuateTag(tag);
       var entry = DicomMetaDictionary.dictionary[punctuatedTag];
       var header = {
-        vrObj: vr,
-        vr: vr.type,
+        vrObj: vr2,
+        vr: vr2.type,
         tag,
         tagObj,
         vm: entry === null || entry === void 0 ? void 0 : entry.vm,
@@ -67642,7 +67661,7 @@ var AsyncDicomReader = /* @__PURE__ */ (function() {
     key: "readSingle",
     value: (function() {
       var _readSingle = _asyncToGenerator(/* @__PURE__ */ _regeneratorRuntime().mark(function _callee11(tagInfo, listener, options) {
-        var length2, stream, syntax, vr, values, times, i, _vr$read, value, _vr$read2, _value, delimiterChar, _values, _values2, coding;
+        var length2, stream, syntax, vr2, values, times, i, _vr$read, value, _vr$read2, _value, delimiterChar, _values, _values2, coding;
         return _regeneratorRuntime().wrap(function _callee11$(_context11) {
           while (1) switch (_context11.prev = _context11.next) {
             case 0:
@@ -67651,25 +67670,25 @@ var AsyncDicomReader = /* @__PURE__ */ (function() {
               _context11.next = 4;
               return this.stream.ensureAvailable(length2);
             case 4:
-              vr = ValueRepresentation.createByTypeString(tagInfo.vr);
+              vr2 = ValueRepresentation.createByTypeString(tagInfo.vr);
               values = [];
-              if (vr.isBinary() && length2 > vr.maxLength && !vr.noMultiple) {
-                times = length2 / vr.maxLength;
+              if (vr2.isBinary() && length2 > vr2.maxLength && !vr2.noMultiple) {
+                times = length2 / vr2.maxLength;
                 i = 0;
                 while (i++ < times) {
                   readLog.trace("readSingle multi-value loop", i, times);
-                  _vr$read = vr.read(stream, vr.maxLength, syntax), value = _vr$read.value;
+                  _vr$read = vr2.read(stream, vr2.maxLength, syntax), value = _vr$read.value;
                   values.push(value);
                 }
               } else {
-                _value = (_vr$read2 = vr.read(stream, length2, syntax)) === null || _vr$read2 === void 0 ? void 0 : _vr$read2.value;
-                if (!vr.isBinary() && singleVRs.indexOf(vr.type) == -1) {
+                _value = (_vr$read2 = vr2.read(stream, length2, syntax)) === null || _vr$read2 === void 0 ? void 0 : _vr$read2.value;
+                if (!vr2.isBinary() && singleVRs.indexOf(vr2.type) == -1) {
                   values = _value;
                   if (typeof _value === "string") {
                     delimiterChar = String.fromCharCode(VM_DELIMITER);
-                    values = vr.dropPadByte(_value.split(delimiterChar));
+                    values = vr2.dropPadByte(_value.split(delimiterChar));
                   }
-                } else if (vr.type == "OW" || vr.type == "OB") {
+                } else if (vr2.type == "OW" || vr2.type == "OB") {
                   values = _value;
                 } else {
                   Array.isArray(_value) ? values = _value : values.push(_value);
@@ -72225,7 +72244,7 @@ var len = length;
 var sqrLen = squaredLength;
 var forEach = (function() {
   var vec = create();
-  return function(a, stride, offset, count, fn2, arg) {
+  return function(a, stride, offset, count, fn, arg) {
     var i, l;
     if (!stride) {
       stride = 3;
@@ -72242,7 +72261,7 @@ var forEach = (function() {
       vec[0] = a[i];
       vec[1] = a[i + 1];
       vec[2] = a[i + 2];
-      fn2(vec, vec, arg);
+      fn(vec, vec, arg);
       a[i] = vec[0];
       a[i + 1] = vec[1];
       a[i + 2] = vec[2];
@@ -73306,7 +73325,7 @@ var AgentDicomChannel = class extends BaseChannel {
               calledAeTitle: this.association?.getCalledAeTitle()
             },
             dataset: dicomJson2,
-            binary: binary ? Re(binary) : void 0
+            binary: binary ? Ce(binary) : void 0
           };
           App.instance.addToWebSocketQueue({
             type: "agent:transmit:request",
@@ -73320,7 +73339,7 @@ var AgentDicomChannel = class extends BaseChannel {
           response2.setStatus(dimse.constants.Status.Success);
         } catch (err2) {
           _DcmjsDimseScp.channel.log.error(`DICOM error - check channel logs`);
-          _DcmjsDimseScp.channel.channelLog.error(`DICOM error: ${Ne(err2)}`);
+          _DcmjsDimseScp.channel.channelLog.error(`DICOM error: ${Se(err2)}`);
           response2.setStatus(dimse.constants.Status.ProcessingFailure);
         }
         return response2;
@@ -73367,7 +73386,7 @@ var AgentDicomChannel = class extends BaseChannel {
       this.server.on("networkError", async (err2) => {
         this.log.error("Network error: ", { err: err2 });
         if (err2?.code === "EADDRINUSE") {
-          await Yr(50);
+          await Kr(50);
           this.server.close();
           this.server.listen(port);
         }
@@ -73644,6 +73663,9 @@ var AgentHl7Channel = class extends BaseChannel {
         this.channelLog.debug(
           `[Skipping ACK -- Mode: ${this.appLevelAckMode} -- ID: ${msgControlId ?? "not provided"} -- ACK: ${ackCode ?? "unknown"}]`
         );
+        if (msgControlId) {
+          this.stats.recordAckReceived(msgControlId);
+        }
         return;
       }
       this.channelLog.info(`[Sending ACK -- ID: ${msgControlId}]: ${hl7Message.toString().replaceAll("\r", "\n")}`);
@@ -73760,12 +73782,12 @@ var AgentHl7ChannelConnection = class {
       }
     } catch (err2) {
       this.channel.log.error(`HL7 error occurred - check channel logs`);
-      this.channel.channelLog.error(`HL7 error: ${Ne(err2)}`);
+      this.channel.channelLog.error(`HL7 error: ${Se(err2)}`);
     }
   }
   async handleError(event) {
-    this.channel.log.error(`HL7 connection error: ${Ne(event.error)}`);
-    this.channel.channelLog.error(`HL7 connection error: ${Ne(event.error)}`);
+    this.channel.log.error(`HL7 connection error: ${Se(event.error)}`);
+    this.channel.channelLog.error(`HL7 connection error: ${Se(event.error)}`);
   }
   handleEnhancedAckSent(event) {
     const hl7Message = event.message;
@@ -74160,13 +74182,13 @@ var Hl7ClientPool = class {
       this.closeAndRemoveClient(client);
       if (this.keepAlive) {
         this.log.error(
-          `Persistent connection to remote 'mllp://${this.host}:${this.port}' encountered error: '${Ne(event.error)}' - Closing connection...`
+          `Persistent connection to remote 'mllp://${this.host}:${this.port}' encountered error: '${Se(event.error)}' - Closing connection...`
         );
       }
     });
     client.addEventListener("warning", (event) => {
       this.log.warn(
-        `Connection to remote 'mllp://${this.host}:${this.port}' warning: '${Ne(event.error)}'`
+        `Connection to remote 'mllp://${this.host}:${this.port}' warning: '${Se(event.error)}'`
       );
     });
     return client;
@@ -74275,7 +74297,7 @@ function parseLoggerConfigFromArgs(args) {
       try {
         configValue = Jh(propVal);
       } catch (err2) {
-        warnings.push(`Error while parsing ${propName}: ${Ne(err2)}`);
+        warnings.push(`Error while parsing ${propName}: ${Se(err2)}`);
       }
     } else if (LOGGER_CONFIG_INTEGER_KEYS.includes(settingName)) {
       try {
@@ -74565,7 +74587,7 @@ async function waitForPidFile(appName, timeoutMs = 3e3) {
     if (Date.now() - startTime > timeoutMs) {
       throw new Error("Timeout while waiting for PID file");
     }
-    await Yr(0);
+    await Kr(0);
   }
 }
 function removeAllPidFiles() {
@@ -74610,7 +74632,9 @@ async function downloadRelease(version, path4) {
   try {
     await (0, import_promises.pipeline)(readable, (0, import_node_fs3.createWriteStream)(path4));
   } catch (err2) {
-    (0, import_node_fs3.unlinkSync)(path4);
+    if ((0, import_node_fs3.existsSync)(path4)) {
+      (0, import_node_fs3.unlinkSync)(path4);
+    }
     throw new Error(`Error while downloading release version ${version} to ${path4}`, { cause: err2 });
   }
 }
@@ -74708,7 +74732,7 @@ var _App = class _App {
     this.medplum.addEventListener("change", () => {
       if (!this.webSocket) {
         this.connectWebSocket().catch((err2) => {
-          this.log.error(Ne(err2));
+          this.log.error(Se(err2));
         });
       } else {
         this.startWebSocketWorker();
@@ -74739,7 +74763,7 @@ var _App = class _App {
     if (!upgradeDetails) {
       return;
     }
-    if (fn.startsWith(upgradeDetails.targetVersion)) {
+    if (pn.startsWith(upgradeDetails.targetVersion)) {
       await this.sendToWebSocket({
         type: "agent:upgrade:response",
         statusCode: 200,
@@ -74747,7 +74771,7 @@ var _App = class _App {
       });
       this.log.info(`Successfully upgraded to version ${upgradeDetails.targetVersion}`);
     } else {
-      const errMsg = `Failed to upgrade to version ${upgradeDetails.targetVersion}. Agent still running with version ${fn}`;
+      const errMsg = `Failed to upgrade to version ${upgradeDetails.targetVersion}. Agent still running with version ${pn}`;
       await this.sendToWebSocket({
         type: "agent:error",
         body: errMsg,
@@ -74774,7 +74798,7 @@ var _App = class _App {
         if (attempt === maxAttempts) {
           throw new Error("Too many unsuccessful attempts to create agent PID file");
         }
-        await Yr(50);
+        await Kr(50);
       }
     }
   }
@@ -74787,7 +74811,7 @@ var _App = class _App {
     if (!this.webSocket) {
       this.log.warn("WebSocket not connected");
       this.connectWebSocket().catch((err2) => {
-        this.log.error(Ne(err2));
+        this.log.error(Se(err2));
       });
       return;
     }
@@ -74847,7 +74871,7 @@ var _App = class _App {
             break;
           case "agent:heartbeat:request":
             this.outstandingHeartbeats = 0;
-            await this.sendToWebSocket({ type: "agent:heartbeat:response", version: fn });
+            await this.sendToWebSocket({ type: "agent:heartbeat:response", version: pn });
             break;
           case "agent:heartbeat:response":
             this.outstandingHeartbeats = 0;
@@ -74899,7 +74923,7 @@ var _App = class _App {
             } catch (err2) {
               await this.sendToWebSocket({
                 type: "agent:error",
-                body: Ne(err2),
+                body: Se(err2),
                 callback: command.callback
               });
             }
@@ -74927,7 +74951,7 @@ var _App = class _App {
           }
         }
       } catch (err2) {
-        const errMsg = `WebSocket error on incoming message: ${Ne(err2)}`;
+        const errMsg = `WebSocket error on incoming message: ${Se(err2)}`;
         this.log.error(errMsg);
         try {
           await this.sendToWebSocket({
@@ -74936,7 +74960,7 @@ var _App = class _App {
             callback: command?.callback
           });
         } catch (sendErr) {
-          this.log.error(`Failed to send agent:error response: ${Ne(sendErr)}`);
+          this.log.error(`Failed to send agent:error response: ${Se(sendErr)}`);
         }
       }
     });
@@ -74972,7 +74996,7 @@ var _App = class _App {
       const results = await Promise.allSettled(Array.from(this.hl7Clients.values()).map((pool) => pool.closeAll()));
       for (const result of results) {
         if (result.status === "rejected") {
-          this.log.error(Ne(result.reason));
+          this.log.error(Se(result.reason));
         }
       }
       this.hl7Clients.clear();
@@ -75098,7 +75122,7 @@ var _App = class _App {
         }
       } catch (err2) {
         errors.push(err2);
-        this.log.error(Ne(err2));
+        this.log.error(Se(err2));
       }
     }
     if (errors.length) {
@@ -75116,7 +75140,7 @@ var _App = class _App {
             (err2) => ({
               severity: "error",
               code: "invalid",
-              details: { text: Ne(err2) }
+              details: { text: Se(err2) }
             })
           )
         ]
@@ -75137,7 +75161,7 @@ var _App = class _App {
       return;
     }
     for (const err2 of errors) {
-      this.log.error(Ne(err2));
+      this.log.error(Se(err2));
     }
     throw new f({
       resourceType: "OperationOutcome",
@@ -75153,7 +75177,7 @@ var _App = class _App {
           (err2) => ({
             severity: "error",
             code: "invalid",
-            details: { text: Ne(err2) }
+            details: { text: Se(err2) }
           })
         )
       ]
@@ -75181,7 +75205,7 @@ var _App = class _App {
         parsedEndpoint = new URL(endpoint.address);
       } catch (err2) {
         throw new Error(
-          `Error while validating endpoint address for channel '${channel.name}': ${Ne(err2)}`
+          `Error while validating endpoint address for channel '${channel.name}': ${Se(err2)}`
         );
       }
       if (seenPorts.has(parsedEndpoint.port)) {
@@ -75222,7 +75246,7 @@ var _App = class _App {
       const channelType = getChannelType(endpoint);
       return this.createChannel(channelType, definition, endpoint);
     } catch (err2) {
-      this.log.error(Ne(err2));
+      this.log.error(Se(err2));
       return void 0;
     }
   }
@@ -75295,7 +75319,7 @@ var _App = class _App {
           try {
             await this.sendToWebSocket(msg);
           } catch (err2) {
-            this.log.error(`WebSocket error while attempting to send message: ${Ne(err2)}`);
+            this.log.error(`WebSocket error while attempting to send message: ${Se(err2)}`);
             this.webSocketQueue.unshift(msg);
             throw err2;
           }
@@ -75371,7 +75395,7 @@ ${result}`);
         body: result
       });
     } catch (err2) {
-      this.log.error(`Error during ping attempt to ${message.remote ?? "NO_HOST_GIVEN"}: ${Ne(err2)}`);
+      this.log.error(`Error during ping attempt to ${message.remote ?? "NO_HOST_GIVEN"}: ${Se(err2)}`);
       this.addToWebSocketQueue({
         type: "agent:transmit:response",
         channel: message.channel,
@@ -75379,12 +75403,12 @@ ${result}`);
         remote: message.remote,
         callback: message.callback,
         statusCode: 400,
-        body: Ne(err2)
+        body: Se(err2)
       });
     }
   }
   async tryUpgradeAgent(message) {
-    this.log.info(`Attempting to upgrade from ${fn} to ${message.version ?? "latest"}...`);
+    this.log.info(`Attempting to upgrade from ${pn} to ${message.version ?? "latest"}...`);
     if ((0, import_node_os4.platform)() !== "win32") {
       const errMsg = "Auto-upgrading is currently only supported on Windows";
       this.log.error(errMsg);
@@ -75419,7 +75443,7 @@ ${result}`);
       return;
     }
     const targetVersion = message.version ?? await Qg("agent-upgrader");
-    if (fn.startsWith(targetVersion)) {
+    if (pn.startsWith(targetVersion)) {
       if (!message?.force) {
         this.log.info(`Attempted to upgrade to version ${targetVersion}, but agent is already on that version`);
         await this.sendToWebSocket({
@@ -75429,7 +75453,7 @@ ${result}`);
         });
         return;
       }
-      this.log.info(`Forcing upgrade from ${fn} to ${targetVersion}`);
+      this.log.info(`Forcing upgrade from ${pn} to ${targetVersion}`);
     }
     if (semver.lt(targetVersion, "4.2.4") && !message.force) {
       const errMsg = `WARNING: ${targetVersion} predates the zero-downtime upgrade feature. Downgrading to this version will 1) incur downtime during the downgrade process, as the current agent must stop itself before installing the older agent, and 2) incur downtime on any subsequent upgrade to a later version. We recommend against downgrading to this version, but if you must, reissue the command with force set to true to downgrade.`;
@@ -75449,14 +75473,16 @@ ${result}`);
         forceKillApp("medplum-agent-upgrader");
         removePidFile("medplum-agent-upgrader");
       }
-      (0, import_node_fs4.unlinkSync)(UPGRADE_MANIFEST_PATH);
+      if ((0, import_node_fs4.existsSync)(UPGRADE_MANIFEST_PATH)) {
+        (0, import_node_fs4.unlinkSync)(UPGRADE_MANIFEST_PATH);
+      }
     }
     try {
       const release = await wn("agent-upgrader", targetVersion);
       parseDownloadUrl(release, (0, import_node_os4.platform)());
     } catch (err2) {
       const versionTag = message.version ? `v${message.version}` : "latest";
-      const errMsg = `Error during upgrading to version '${versionTag}': ${Ne(err2)}`;
+      const errMsg = `Error during upgrading to version '${versionTag}': ${Se(err2)}`;
       this.log.error(errMsg);
       await this.sendToWebSocket({
         type: "agent:error",
@@ -75490,13 +75516,13 @@ ${result}`);
           }
         });
         child.on("error", (err2) => {
-          this.log.error(Ne(err2));
+          this.log.error(Se(err2));
           reject(err2);
         });
       });
     } catch (err2) {
       const versionTag = message.version ? `v${message.version}` : "latest";
-      const errMsg = `Error during upgrading to version '${versionTag}': ${Ne(err2)}`;
+      const errMsg = `Error during upgrading to version '${versionTag}': ${Se(err2)}`;
       this.log.error(errMsg);
       await this.sendToWebSocket({
         type: "agent:error",
@@ -75506,11 +75532,11 @@ ${result}`);
       return;
     }
     try {
-      this.log.info("Writing upgrade manifest...", { previousVersion: fn, targetVersion });
+      this.log.info("Writing upgrade manifest...", { previousVersion: pn, targetVersion });
       (0, import_node_fs4.writeFileSync)(
         UPGRADE_MANIFEST_PATH,
         JSON.stringify({
-          previousVersion: fn,
+          previousVersion: pn,
           targetVersion,
           callback: message.callback ?? null
         }),
@@ -75520,7 +75546,7 @@ ${result}`);
       child.disconnect();
     } catch (err2) {
       this.log.error(
-        `Error while stopping agent or messaging child process as part of upgrade: ${Ne(err2)}`
+        `Error while stopping agent or messaging child process as part of upgrade: ${Se(err2)}`
       );
       import_node_process2.default.exit(1);
     }
@@ -75534,10 +75560,10 @@ ${result}`);
         callback: command.callback
       });
     } catch (err2) {
-      this.log.error(Ne(err2));
+      this.log.error(Se(err2));
       await this.sendToWebSocket({
         type: "agent:error",
-        body: Ne(err2),
+        body: Se(err2),
         callback: command.callback
       });
     }
@@ -75562,10 +75588,10 @@ ${result}`);
         callback: command.callback
       });
     } catch (err2) {
-      this.log.error(Ne(err2));
+      this.log.error(Se(err2));
       await this.sendToWebSocket({
         type: "agent:error",
-        body: Ne(err2),
+        body: Se(err2),
         callback: command.callback
       });
     }
@@ -75606,7 +75632,7 @@ ${result}`);
     try {
       msgReturnAck = this.parseReturnAck(message.returnAck);
     } catch (err2) {
-      this.log.error(Ne(err2));
+      this.log.error(Se(err2));
       this.addToWebSocketQueue({
         type: "agent:transmit:response",
         channel: message.channel,
@@ -75614,7 +75640,7 @@ ${result}`);
         callback: message.callback,
         contentType: k.TEXT,
         statusCode: 400,
-        body: Ne(err2)
+        body: Se(err2)
       });
       return;
     }
@@ -75622,7 +75648,7 @@ ${result}`);
     try {
       defaultReturnAck = this.parseReturnAck(address.searchParams.get("defaultReturnAck"));
     } catch (err2) {
-      this.log.warn(`${Ne(err2)} - falling back to default return ACK behavior of 'first'.`);
+      this.log.warn(`${Se(err2)} - falling back to default return ACK behavior of 'first'.`);
     }
     const returnAck = msgReturnAck ?? defaultReturnAck ?? af.FIRST;
     let pool;
@@ -75667,7 +75693,7 @@ ${result}`);
     try {
       client = pool.getClient();
     } catch (err2) {
-      this.log.error(`Failed to get client from pool: ${Ne(err2)}`);
+      this.log.error(`Failed to get client from pool: ${Se(err2)}`);
       this.addToWebSocketQueue({
         type: "agent:transmit:response",
         channel: message.channel,
@@ -75675,7 +75701,7 @@ ${result}`);
         callback: message.callback,
         contentType: k.TEXT,
         statusCode: 400,
-        body: Ne(err2)
+        body: Se(err2)
       });
       return;
     }
@@ -75691,7 +75717,7 @@ ${result}`);
         body: response2.toString()
       });
     }).catch((err2) => {
-      this.log.error(`HL7 error: ${Ne(err2)}`);
+      this.log.error(`HL7 error: ${Se(err2)}`);
       this.addToWebSocketQueue({
         type: "agent:transmit:response",
         channel: message.channel,
@@ -75699,7 +75725,7 @@ ${result}`);
         callback: message.callback,
         contentType: k.TEXT,
         statusCode: 400,
-        body: Ne(err2)
+        body: Se(err2)
       });
       forceClose = true;
     }).finally(() => {
@@ -75778,9 +75804,9 @@ async function agentMain(argv) {
       await medplum.startClientLogin(clientId, clientSecret);
       loggedIn = true;
     } catch (err2) {
-      console.error("Failed to login", { err: Ne(err2) });
+      console.error("Failed to login", { err: Se(err2) });
       console.log("Retrying login in 10 seconds...");
-      await Yr(RETRY_WAIT_DURATION_MS);
+      await Kr(RETRY_WAIT_DURATION_MS);
     }
   }
   if (args.logLevel) {
@@ -75850,7 +75876,7 @@ async function upgraderMain(argv) {
       globalLogger.info("Release successfully downloaded");
     }
   } catch (err2) {
-    import_node_process3.default.send({ type: "ERROR", err: Ne(err2) });
+    import_node_process3.default.send({ type: "ERROR", err: Se(err2) });
     throw err2;
   }
   import_node_process3.default.send({ type: "STARTED" });
@@ -75871,7 +75897,7 @@ async function upgraderMain(argv) {
     (0, import_node_child_process2.spawnSync)(`"${binPath}" /S`, { windowsHide: true, shell: true });
     globalLogger.info(`Agent version ${version} successfully installed`);
   } catch (err2) {
-    globalLogger.error(`Error while attempting to run installer: ${Ne(err2)}`);
+    globalLogger.error(`Error while attempting to run installer: ${Se(err2)}`);
     globalLogger.error("Failed to run installer, attempting to restart agent service...");
     try {
       (0, import_node_child_process2.execSync)('net start "Medplum Agent"');
@@ -75897,7 +75923,7 @@ async function main(argv) {
   } else if (argv[2] === "--remove-old-services") {
     const logFileFd = (0, import_node_fs7.openSync)(TEMP_LOG_FILE, "a");
     let allAgentServices = [];
-    const currentServiceName = `MedplumAgent_${fn}`;
+    const currentServiceName = `MedplumAgent_${pn}`;
     while (!allAgentServices.includes(currentServiceName)) {
       const output = (0, import_node_child_process3.execSync)('cmd.exe /c sc query type= service state= all | findstr /i "SERVICE_NAME.*MedplumAgent"');
       (0, import_node_fs7.appendFileSync)(logFileFd, `${output}\r
@@ -75907,8 +75933,8 @@ async function main(argv) {
 ${allAgentServices.join("\r\n")}\r
 `, { encoding: "utf-8" });
     }
-    const servicesToRemove = argv[3] === "--all" ? allAgentServices : allAgentServices.filter((serviceName) => serviceName !== `MedplumAgent_${fn}`);
-    (0, import_node_fs7.appendFileSync)(logFileFd, `Medplum agent service to filter out: MedplumAgent_${fn}\r
+    const servicesToRemove = argv[3] === "--all" ? allAgentServices : allAgentServices.filter((serviceName) => serviceName !== `MedplumAgent_${pn}`);
+    (0, import_node_fs7.appendFileSync)(logFileFd, `Medplum agent service to filter out: MedplumAgent_${pn}\r
 `, {
       encoding: "utf-8"
     });
@@ -75921,10 +75947,10 @@ ${allAgentServices.join("\r\n")}\r
       } catch (err2) {
         (0, import_node_fs7.appendFileSync)(logFileFd, `Failed to stop service: ${serviceName}\r
 `, { encoding: "utf-8" });
-        (0, import_node_fs7.appendFileSync)(logFileFd, `${Ne(err2)}\r
+        (0, import_node_fs7.appendFileSync)(logFileFd, `${Se(err2)}\r
 `, { encoding: "utf-8" });
         console.error(`Failed to stop service: ${serviceName}`);
-        console.error(Ne(err2));
+        console.error(Se(err2));
       }
       try {
         (0, import_node_child_process3.execSync)(`sc.exe delete ${serviceName}`);
@@ -75934,10 +75960,10 @@ ${allAgentServices.join("\r\n")}\r
       } catch (err2) {
         (0, import_node_fs7.appendFileSync)(logFileFd, `Failed to delete service: ${serviceName}\r
 `, { encoding: "utf-8" });
-        (0, import_node_fs7.appendFileSync)(logFileFd, `${Ne(err2)}\r
+        (0, import_node_fs7.appendFileSync)(logFileFd, `${Se(err2)}\r
 `, { encoding: "utf-8" });
         console.error(`Failed to delete service: ${serviceName}`);
-        console.error(Ne(err2));
+        console.error(Se(err2));
       }
     }
     (0, import_node_fs7.closeSync)(logFileFd);