@medplum/core 1.0.4 → 1.0.6

package/dist/cjs/{index.js → index.cjs}

@@ -19,16 +19,6 @@
     PERFORMANCE OF THIS SOFTWARE.
     ***************************************************************************** */
 
-    function __awaiter(thisArg, _arguments, P, generator) {
-        function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-        return new (P || (P = Promise))(function (resolve, reject) {
-            function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-            function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-            function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-            step((generator = generator.apply(thisArg, _arguments || [])).next());
-        });
-    }
-
     function __classPrivateFieldGet(receiver, state, kind, f) {
         if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
         if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
@@ -132,10 +122,10 @@
             }
             builder.push(cityStateZip.join(', '));
         }
-        if (address.use && ((options === null || options === void 0 ? void 0 : options.all) || (options === null || options === void 0 ? void 0 : options.use))) {
+        if (address.use && (options?.all || options?.use)) {
             builder.push('[' + address.use + ']');
         }
-        return builder.join((options === null || options === void 0 ? void 0 : options.lineSeparator) || ', ').trim();
+        return builder.join(options?.lineSeparator || ', ').trim();
     }
     /**
      * Formats a FHIR HumanName as a string.
@@ -145,7 +135,7 @@
      */
     function formatHumanName(name, options) {
         const builder = [];
-        if (name.prefix && (options === null || options === void 0 ? void 0 : options.prefix) !== false) {
+        if (name.prefix && options?.prefix !== false) {
             builder.push(...name.prefix);
         }
         if (name.given) {
@@ -154,10 +144,10 @@
         if (name.family) {
             builder.push(name.family);
         }
-        if (name.suffix && (options === null || options === void 0 ? void 0 : options.suffix) !== false) {
+        if (name.suffix && options?.suffix !== false) {
             builder.push(...name.suffix);
         }
-        if (name.use && ((options === null || options === void 0 ? void 0 : options.all) || (options === null || options === void 0 ? void 0 : options.use))) {
+        if (name.use && (options?.all || options?.use)) {
             builder.push('[' + name.use + ']');
         }
         return builder.join(' ').trim();
@@ -208,7 +198,7 @@
             return '';
         }
         d.setUTCHours(0, 0, 0, 0);
-        return d.toLocaleDateString(locales, Object.assign({ timeZone: 'UTC' }, options));
+        return d.toLocaleDateString(locales, { timeZone: 'UTC', ...options });
     }
     /**
      * Formats a FHIR time string as a human readable string.
@@ -292,12 +282,11 @@
      * @returns The formatted timing string.
      */
     function formatTiming(timing) {
-        var _a;
         if (!timing) {
             return '';
         }
         const builder = [];
-        if ((_a = timing.repeat) === null || _a === void 0 ? void 0 : _a.periodUnit) {
+        if (timing.repeat?.periodUnit) {
             const frequency = timing.repeat.frequency || 1;
             const period = timing.repeat.period || 1;
             const periodUnit = timing.repeat.periodUnit;
@@ -337,31 +326,30 @@
      * @returns A human-readable string representation of the Range
      */
     function formatRange(range, precision, exclusive = false) {
-        var _a, _b, _c, _d;
         if (exclusive && precision === undefined) {
             throw new Error('Precision must be specified for exclusive ranges');
         }
-        const low = (range === null || range === void 0 ? void 0 : range.low) && Object.assign({}, range.low);
-        const high = (range === null || range === void 0 ? void 0 : range.high) && Object.assign({}, range.high);
-        if (!range || ((low === null || low === void 0 ? void 0 : low.value) === undefined && (high === null || high === void 0 ? void 0 : high.value) === undefined)) {
+        const low = range?.low && { ...range.low };
+        const high = range?.high && { ...range.high };
+        if (!range || (low?.value === undefined && high?.value === undefined)) {
             return '';
         }
-        if (((_a = range.low) === null || _a === void 0 ? void 0 : _a.value) !== undefined && ((_b = range.high) === null || _b === void 0 ? void 0 : _b.value) === undefined) {
+        if (range.low?.value !== undefined && range.high?.value === undefined) {
             if (exclusive && precision !== undefined) {
                 range.low.value = preciseDecrement(range.low.value, precision);
                 return `> ${formatQuantity(range.low, precision)}`;
             }
             return `>= ${formatQuantity(range.low, precision)}`;
         }
-        if (((_c = range.low) === null || _c === void 0 ? void 0 : _c.value) === undefined && ((_d = range.high) === null || _d === void 0 ? void 0 : _d.value) !== undefined) {
+        if (range.low?.value === undefined && range.high?.value !== undefined) {
             if (exclusive && precision !== undefined) {
                 range.high.value = preciseIncrement(range.high.value, precision);
                 return `< ${formatQuantity(range.high, precision)}`;
             }
             return `<= ${formatQuantity(range.high, precision)}`;
         }
-        if ((low === null || low === void 0 ? void 0 : low.unit) === (high === null || high === void 0 ? void 0 : high.unit)) {
-            low === null || low === void 0 ? true : delete low.unit;
+        if (low?.unit === high?.unit) {
+            delete low?.unit;
         }
         return `${formatQuantity(low, precision)} - ${formatQuantity(high, precision)}`;
     }
@@ -395,6 +383,16 @@
         }
         return result.join('').trim();
     }
+    function formatMoney(money) {
+        if (money?.value === undefined) {
+            return '';
+        }
+        return money.value.toLocaleString(undefined, {
+            style: 'currency',
+            currency: money.currency || 'USD',
+            currencyDisplay: 'narrowSymbol',
+        });
+    }
     /**
      * Formats a CodeableConcept element as a string.
      * @param codeableConcept A FHIR CodeableConcept element
@@ -418,7 +416,7 @@
      * @returns The coding as a string.
      */
     function formatCoding(coding) {
-        return (coding === null || coding === void 0 ? void 0 : coding.display) || (coding === null || coding === void 0 ? void 0 : coding.code) || '';
+        return coding?.display || coding?.code || '';
     }
     /**
      * Formats a FHIR Observation resource value as a string.
@@ -432,7 +430,7 @@
         if ('component' in obs) {
             return obs.component.map((c) => formatObservationValue(c)).join(' / ');
         }
-        if (obs === null || obs === void 0 ? void 0 : obs.valueQuantity) {
+        if (obs?.valueQuantity) {
             return formatQuantity(obs.valueQuantity);
         }
         if (obs.valueCodeableConcept) {
@@ -499,8 +497,7 @@
      * @returns The ID portion of a reference.
      */
     function resolveId(reference) {
-        var _a;
-        return (_a = reference === null || reference === void 0 ? void 0 : reference.reference) === null || _a === void 0 ? void 0 : _a.split('/')[1];
+        return reference?.reference?.split('/')[1];
     }
     /**
      * Returns true if the resource is a "ProfileResource".
@@ -518,7 +515,6 @@
      * @return Human friendly display string.
      */
     function getDisplayString(resource) {
-        var _a;
         if (isProfileResource(resource)) {
             const profileName = getProfileResourceDisplayString(resource);
             if (profileName) {
@@ -532,7 +528,7 @@
             }
         }
         if (resource.resourceType === 'Observation') {
-            if ('code' in resource && ((_a = resource.code) === null || _a === void 0 ? void 0 : _a.text)) {
+            if ('code' in resource && resource.code?.text) {
                 return resource.code.text;
             }
         }
@@ -717,14 +713,13 @@
      * @returns The extension value if found; undefined otherwise.
      */
     function getExtensionValue(resource, ...urls) {
-        var _a;
         // Let curr be the current resource or extension. Extensions can be nested.
         let curr = resource;
         // For each of the urls, try to find a matching nested extension.
         for (let i = 0; i < urls.length && curr; i++) {
-            curr = (_a = curr === null || curr === void 0 ? void 0 : curr.extension) === null || _a === void 0 ? void 0 : _a.find((e) => e.url === urls[i]);
+            curr = curr?.extension?.find((e) => e.url === urls[i]);
         }
-        return curr === null || curr === void 0 ? void 0 : curr.valueString;
+        return curr?.valueString;
     }
     /**
      * FHIR JSON stringify.
@@ -915,8 +910,7 @@
      * @returns The code if found; otherwise undefined.
      */
     function getCodeBySystem(concept, system) {
-        var _a, _b;
-        return (_b = (_a = concept === null || concept === void 0 ? void 0 : concept.coding) === null || _a === void 0 ? void 0 : _a.find((coding) => coding.system === system)) === null || _b === void 0 ? void 0 : _b.code;
+        return concept?.coding?.find((coding) => coding.system === system)?.code;
     }
     /**
      * Sets a code for a given system within a given codeable concept.
@@ -925,16 +919,15 @@
      * @param code The code value.
      */
     function setCodeBySystem(concept, system, code) {
-        var _a, _b;
         if (!concept.coding) {
             concept.coding = [];
         }
-        const coding = (_a = concept.coding) === null || _a === void 0 ? void 0 : _a.find((c) => c.system === system);
+        const coding = concept.coding?.find((c) => c.system === system);
         if (coding) {
             coding.code = code;
         }
         else {
-            (_b = concept.coding) === null || _b === void 0 ? void 0 : _b.push({ system, code });
+            concept.coding?.push({ system, code });
         }
     }
     /**
@@ -945,13 +938,9 @@
      * @returns The observation interval if found; otherwise undefined.
      */
     function findObservationInterval(definition, patient, value, category) {
-        var _a;
-        return (_a = definition.qualifiedInterval) === null || _a === void 0 ? void 0 : _a.find((interval) => {
-            var _a;
-            return observationIntervalMatchesPatient(interval, patient) &&
-                observationIntervalMatchesValue(interval, value, (_a = definition.quantitativeDetails) === null || _a === void 0 ? void 0 : _a.decimalPrecision) &&
-                (category === undefined || interval.category === category);
-        });
+        return definition.qualifiedInterval?.find((interval) => observationIntervalMatchesPatient(interval, patient) &&
+            observationIntervalMatchesValue(interval, value, definition.quantitativeDetails?.decimalPrecision) &&
+            (category === undefined || interval.category === category));
     }
     /**
      * Tries to find an observation reference range for the given patient and condition names.
@@ -961,8 +950,7 @@
      * @returns The observation interval if found; otherwise undefined.
      */
     function findObservationReferenceRange(definition, patient, names) {
-        var _a;
-        return (_a = definition.qualifiedInterval) === null || _a === void 0 ? void 0 : _a.find((interval) => observationIntervalMatchesPatient(interval, patient) && names.includes(interval.condition));
+        return definition.qualifiedInterval?.find((interval) => observationIntervalMatchesPatient(interval, patient) && names.includes(interval.condition));
     }
     /**
      * Returns true if the patient matches the observation interval.
@@ -1009,9 +997,8 @@
      * @returns True if the value is within the range.
      */
     function matchesRange(value, range, precision) {
-        var _a, _b;
-        return ((((_a = range.low) === null || _a === void 0 ? void 0 : _a.value) === undefined || preciseGreaterThanOrEquals(value, range.low.value, precision)) &&
-            (((_b = range.high) === null || _b === void 0 ? void 0 : _b.value) === undefined || preciseLessThanOrEquals(value, range.high.value, precision)));
+        return ((range.low?.value === undefined || preciseGreaterThanOrEquals(value, range.low.value, precision)) &&
+            (range.high?.value === undefined || preciseLessThanOrEquals(value, range.high.value, precision)));
     }
     /**
      * Returns the input number rounded to the specified number of digits.
@@ -1098,10 +1085,8 @@
      * Encrypts a string with SHA256 encryption.
      * @param str
      */
-    function encryptSHA256(str) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return crypto.subtle.digest('SHA-256', new TextEncoder().encode(str));
-        });
+    async function encryptSHA256(str) {
+        return crypto.subtle.digest('SHA-256', new TextEncoder().encode(str));
     }
 
     /*
@@ -1317,8 +1302,7 @@
          * Returns the current value associated with the given key, or null if the given key does not exist.
          */
         getItem(key) {
-            var _a;
-            return (_a = __classPrivateFieldGet(this, _MemoryStorage_data, "f").get(key)) !== null && _a !== void 0 ? _a : null;
+            return __classPrivateFieldGet(this, _MemoryStorage_data, "f").get(key) ?? null;
         }
         /**
          * Sets the value of the pair identified by key to value, creating a new key/value pair if none existed for key previously.
@@ -6319,12 +6303,11 @@
      * @see {@link IndexedStructureDefinition} for more details on indexed StructureDefinitions.
      */
     function indexStructureDefinition(structureDefinition) {
-        var _a;
         const typeName = structureDefinition.name;
         if (!typeName) {
             return;
         }
-        const elements = (_a = structureDefinition.snapshot) === null || _a === void 0 ? void 0 : _a.element;
+        const elements = structureDefinition.snapshot?.element;
         if (elements) {
             // First pass, build types
             elements.forEach((element) => indexType(structureDefinition, element));
@@ -6341,9 +6324,8 @@
      * @see {@link IndexedStructureDefinition} for more details on indexed StructureDefinitions.
      */
     function indexType(structureDefinition, elementDefinition) {
-        var _a, _b;
         const path = elementDefinition.path;
-        const typeCode = (_b = (_a = elementDefinition.type) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.code;
+        const typeCode = elementDefinition.type?.[0]?.code;
         if (typeCode !== undefined && typeCode !== 'Element' && typeCode !== 'BackboneElement') {
             return;
         }
@@ -6460,12 +6442,11 @@
      * @returns The element definition if found.
      */
     function getElementDefinition(typeName, propertyName) {
-        var _a;
         const typeSchema = globalSchema.types[typeName];
         if (!typeSchema) {
             return undefined;
         }
-        const property = (_a = typeSchema.properties[propertyName]) !== null && _a !== void 0 ? _a : typeSchema.properties[propertyName + '[x]'];
+        const property = typeSchema.properties[propertyName] ?? typeSchema.properties[propertyName + '[x]'];
         if (!property) {
             return undefined;
         }
@@ -6486,8 +6467,8 @@
 
     // PKCE auth based on:
     // https://aws.amazon.com/blogs/security/how-to-add-authentication-single-page-web-application-with-amazon-cognito-oauth2-implementation/
-    var _MedplumClient_instances, _MedplumClient_fetch, _MedplumClient_createPdf, _MedplumClient_storage, _MedplumClient_requestCache, _MedplumClient_cacheTime, _MedplumClient_baseUrl, _MedplumClient_clientId, _MedplumClient_authorizeUrl, _MedplumClient_tokenUrl, _MedplumClient_logoutUrl, _MedplumClient_onUnauthenticated, _MedplumClient_accessToken, _MedplumClient_refreshToken, _MedplumClient_refreshPromise, _MedplumClient_profilePromise, _MedplumClient_profile, _MedplumClient_config, _MedplumClient_addLogin, _MedplumClient_refreshProfile, _MedplumClient_getCacheEntry, _MedplumClient_setCacheEntry, _MedplumClient_request, _MedplumClient_addFetchOptionsDefaults, _MedplumClient_setRequestContentType, _MedplumClient_setRequestBody, _MedplumClient_handleUnauthenticated, _MedplumClient_requestAuthorization, _MedplumClient_refresh, _MedplumClient_fetchTokens, _MedplumClient_verifyTokens, _MedplumClient_setupStorageListener;
-    const MEDPLUM_VERSION = "1.0.4-6dbdb7f6";
+    var _MedplumClient_instances, _MedplumClient_fetch, _MedplumClient_createPdf, _MedplumClient_storage, _MedplumClient_requestCache, _MedplumClient_cacheTime, _MedplumClient_baseUrl, _MedplumClient_authorizeUrl, _MedplumClient_tokenUrl, _MedplumClient_logoutUrl, _MedplumClient_onUnauthenticated, _MedplumClient_clientId, _MedplumClient_clientSecret, _MedplumClient_accessToken, _MedplumClient_refreshToken, _MedplumClient_refreshPromise, _MedplumClient_profilePromise, _MedplumClient_profile, _MedplumClient_config, _MedplumClient_addLogin, _MedplumClient_refreshProfile, _MedplumClient_getCacheEntry, _MedplumClient_setCacheEntry, _MedplumClient_request, _MedplumClient_addFetchOptionsDefaults, _MedplumClient_setRequestContentType, _MedplumClient_setRequestBody, _MedplumClient_handleUnauthenticated, _MedplumClient_requestAuthorization, _MedplumClient_refresh, _MedplumClient_fetchTokens, _MedplumClient_verifyTokens, _MedplumClient_setupStorageListener;
+    const MEDPLUM_VERSION = "1.0.6-5860113c";
     const DEFAULT_BASE_URL = 'https://api.medplum.com/';
     const DEFAULT_RESOURCE_CACHE_SIZE = 1000;
     const DEFAULT_CACHE_TIME = 60000; // 60 seconds
@@ -6548,7 +6529,6 @@
      */
     class MedplumClient extends EventTarget {
         constructor(options) {
-            var _a, _b;
             super();
             _MedplumClient_instances.add(this);
             _MedplumClient_fetch.set(this, void 0);
@@ -6557,33 +6537,34 @@
             _MedplumClient_requestCache.set(this, void 0);
             _MedplumClient_cacheTime.set(this, void 0);
             _MedplumClient_baseUrl.set(this, void 0);
-            _MedplumClient_clientId.set(this, void 0);
             _MedplumClient_authorizeUrl.set(this, void 0);
             _MedplumClient_tokenUrl.set(this, void 0);
             _MedplumClient_logoutUrl.set(this, void 0);
             _MedplumClient_onUnauthenticated.set(this, void 0);
+            _MedplumClient_clientId.set(this, void 0);
+            _MedplumClient_clientSecret.set(this, void 0);
             _MedplumClient_accessToken.set(this, void 0);
             _MedplumClient_refreshToken.set(this, void 0);
             _MedplumClient_refreshPromise.set(this, void 0);
             _MedplumClient_profilePromise.set(this, void 0);
             _MedplumClient_profile.set(this, void 0);
             _MedplumClient_config.set(this, void 0);
-            if (options === null || options === void 0 ? void 0 : options.baseUrl) {
+            if (options?.baseUrl) {
                 if (!options.baseUrl.startsWith('http')) {
                     throw new Error('Base URL must start with http or https');
                 }
             }
-            __classPrivateFieldSet(this, _MedplumClient_fetch, (options === null || options === void 0 ? void 0 : options.fetch) || window.fetch.bind(window), "f");
-            __classPrivateFieldSet(this, _MedplumClient_createPdf, options === null || options === void 0 ? void 0 : options.createPdf, "f");
+            __classPrivateFieldSet(this, _MedplumClient_fetch, options?.fetch || window.fetch.bind(window), "f");
+            __classPrivateFieldSet(this, _MedplumClient_createPdf, options?.createPdf, "f");
             __classPrivateFieldSet(this, _MedplumClient_storage, new ClientStorage(), "f");
-            __classPrivateFieldSet(this, _MedplumClient_requestCache, new LRUCache((_a = options === null || options === void 0 ? void 0 : options.resourceCacheSize) !== null && _a !== void 0 ? _a : DEFAULT_RESOURCE_CACHE_SIZE), "f");
-            __classPrivateFieldSet(this, _MedplumClient_cacheTime, (_b = options === null || options === void 0 ? void 0 : options.cacheTime) !== null && _b !== void 0 ? _b : DEFAULT_CACHE_TIME, "f");
-            __classPrivateFieldSet(this, _MedplumClient_baseUrl, ensureTrailingSlash(options === null || options === void 0 ? void 0 : options.baseUrl) || DEFAULT_BASE_URL, "f");
-            __classPrivateFieldSet(this, _MedplumClient_clientId, (options === null || options === void 0 ? void 0 : options.clientId) || '', "f");
-            __classPrivateFieldSet(this, _MedplumClient_authorizeUrl, (options === null || options === void 0 ? void 0 : options.authorizeUrl) || __classPrivateFieldGet(this, _MedplumClient_baseUrl, "f") + 'oauth2/authorize', "f");
-            __classPrivateFieldSet(this, _MedplumClient_tokenUrl, (options === null || options === void 0 ? void 0 : options.tokenUrl) || __classPrivateFieldGet(this, _MedplumClient_baseUrl, "f") + 'oauth2/token', "f");
-            __classPrivateFieldSet(this, _MedplumClient_logoutUrl, (options === null || options === void 0 ? void 0 : options.logoutUrl) || __classPrivateFieldGet(this, _MedplumClient_baseUrl, "f") + 'oauth2/logout', "f");
-            __classPrivateFieldSet(this, _MedplumClient_onUnauthenticated, options === null || options === void 0 ? void 0 : options.onUnauthenticated, "f");
+            __classPrivateFieldSet(this, _MedplumClient_requestCache, new LRUCache(options?.resourceCacheSize ?? DEFAULT_RESOURCE_CACHE_SIZE), "f");
+            __classPrivateFieldSet(this, _MedplumClient_cacheTime, options?.cacheTime ?? DEFAULT_CACHE_TIME, "f");
+            __classPrivateFieldSet(this, _MedplumClient_baseUrl, ensureTrailingSlash(options?.baseUrl) || DEFAULT_BASE_URL, "f");
+            __classPrivateFieldSet(this, _MedplumClient_clientId, options?.clientId || '', "f");
+            __classPrivateFieldSet(this, _MedplumClient_authorizeUrl, options?.authorizeUrl || __classPrivateFieldGet(this, _MedplumClient_baseUrl, "f") + 'oauth2/authorize', "f");
+            __classPrivateFieldSet(this, _MedplumClient_tokenUrl, options?.tokenUrl || __classPrivateFieldGet(this, _MedplumClient_baseUrl, "f") + 'oauth2/token', "f");
+            __classPrivateFieldSet(this, _MedplumClient_logoutUrl, options?.logoutUrl || __classPrivateFieldGet(this, _MedplumClient_baseUrl, "f") + 'oauth2/logout', "f");
+            __classPrivateFieldSet(this, _MedplumClient_onUnauthenticated, options?.onUnauthenticated, "f");
             const activeLogin = this.getActiveLogin();
             if (activeLogin) {
                 __classPrivateFieldSet(this, _MedplumClient_accessToken, activeLogin.accessToken, "f");
@@ -6758,10 +6739,12 @@
          * @param newUserRequest Register request including email and password.
          * @returns Promise to the authentication response.
          */
-        startNewUser(newUserRequest) {
-            return __awaiter(this, void 0, void 0, function* () {
-                yield this.startPkce();
-                return this.post('auth/newuser', Object.assign(Object.assign({}, newUserRequest), { codeChallengeMethod: 'S256', codeChallenge: sessionStorage.getItem('codeChallenge') }));
+        async startNewUser(newUserRequest) {
+            await this.startPkce();
+            return this.post('auth/newuser', {
+                ...newUserRequest,
+                codeChallengeMethod: 'S256',
+                codeChallenge: sessionStorage.getItem('codeChallenge'),
             });
         }
         /**
@@ -6772,10 +6755,8 @@
          * @param newProjectRequest Register request including email and password.
          * @returns Promise to the authentication response.
          */
-        startNewProject(newProjectRequest) {
-            return __awaiter(this, void 0, void 0, function* () {
-                return this.post('auth/newproject', newProjectRequest);
-            });
+        async startNewProject(newProjectRequest) {
+            return this.post('auth/newproject', newProjectRequest);
         }
         /**
          * Initiates a new patient flow.
@@ -6785,10 +6766,8 @@
          * @param newPatientRequest Register request including email and password.
          * @returns Promise to the authentication response.
          */
-        startNewPatient(newPatientRequest) {
-            return __awaiter(this, void 0, void 0, function* () {
-                return this.post('auth/newpatient', newPatientRequest);
-            });
+        async startNewPatient(newPatientRequest) {
+            return this.post('auth/newpatient', newPatientRequest);
         }
         /**
          * Initiates a user login flow.
@@ -6796,12 +6775,14 @@
          * @param loginRequest Login request including email and password.
          * @returns Promise to the authentication response.
          */
-        startLogin(loginRequest) {
-            var _a;
-            return __awaiter(this, void 0, void 0, function* () {
-                const { codeChallenge, codeChallengeMethod } = this.getCodeChallenge(loginRequest);
-                return this.post('auth/login', Object.assign(Object.assign({}, loginRequest), { clientId: (_a = loginRequest.clientId) !== null && _a !== void 0 ? _a : __classPrivateFieldGet(this, _MedplumClient_clientId, "f"), scope: loginRequest.scope, codeChallengeMethod,
-                    codeChallenge }));
+        async startLogin(loginRequest) {
+            const { codeChallenge, codeChallengeMethod } = this.getCodeChallenge(loginRequest);
+            return this.post('auth/login', {
+                ...loginRequest,
+                clientId: loginRequest.clientId ?? __classPrivateFieldGet(this, _MedplumClient_clientId, "f"),
+                scope: loginRequest.scope,
+                codeChallengeMethod,
+                codeChallenge,
             });
         }
         /**
@@ -6812,12 +6793,14 @@
          * @param loginRequest Login request including Google credential response.
          * @returns Promise to the authentication response.
          */
-        startGoogleLogin(loginRequest) {
-            var _a;
-            return __awaiter(this, void 0, void 0, function* () {
-                const { codeChallenge, codeChallengeMethod } = this.getCodeChallenge(loginRequest);
-                return this.post('auth/google', Object.assign(Object.assign({}, loginRequest), { clientId: (_a = loginRequest.clientId) !== null && _a !== void 0 ? _a : __classPrivateFieldGet(this, _MedplumClient_clientId, "f"), scope: loginRequest.scope, codeChallengeMethod,
-                    codeChallenge }));
+        async startGoogleLogin(loginRequest) {
+            const { codeChallenge, codeChallengeMethod } = this.getCodeChallenge(loginRequest);
+            return this.post('auth/google', {
+                ...loginRequest,
+                clientId: loginRequest.clientId ?? __classPrivateFieldGet(this, _MedplumClient_clientId, "f"),
+                scope: loginRequest.scope,
+                codeChallengeMethod,
+                codeChallenge,
             });
         }
         getCodeChallenge(loginRequest) {
@@ -6850,18 +6833,16 @@
          * This may result in navigating away to the sign in page.
          * @category Authentication
          */
-        signInWithRedirect() {
-            return __awaiter(this, void 0, void 0, function* () {
-                const urlParams = new URLSearchParams(window.location.search);
-                const code = urlParams.get('code');
-                if (!code) {
-                    yield __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_requestAuthorization).call(this);
-                    return undefined;
-                }
-                else {
-                    return this.processCode(code);
-                }
-            });
+        async signInWithRedirect() {
+            const urlParams = new URLSearchParams(window.location.search);
+            const code = urlParams.get('code');
+            if (!code) {
+                await __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_requestAuthorization).call(this);
+                return undefined;
+            }
+            else {
+                return this.processCode(code);
+            }
         }
         /**
          * Tries to sign out the user.
@@ -6977,7 +6958,7 @@
             if (cached) {
                 return cached.value;
             }
-            const promise = new ReadablePromise(this.search(resourceType, url.searchParams, options).then((b) => { var _a, _b; return (_b = (_a = b.entry) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.resource; }));
+            const promise = new ReadablePromise(this.search(resourceType, url.searchParams, options).then((b) => b.entry?.[0]?.resource));
             __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_setCacheEntry).call(this, cacheKey, promise);
             return promise;
         }
@@ -7010,7 +6991,7 @@
             if (cached) {
                 return cached.value;
             }
-            const promise = new ReadablePromise(this.search(resourceType, query, options).then((b) => { var _a, _b; return (_b = (_a = b.entry) === null || _a === void 0 ? void 0 : _a.map((e) => e.resource)) !== null && _b !== void 0 ? _b : []; }));
+            const promise = new ReadablePromise(this.search(resourceType, query, options).then((b) => b.entry?.map((e) => e.resource) ?? []));
             __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_setCacheEntry).call(this, cacheKey, promise);
             return promise;
         }
@@ -7038,8 +7019,7 @@
          * @returns The resource if it is available in the cache; undefined otherwise.
          */
         getCached(resourceType, id) {
-            var _a;
-            const cached = (_a = __classPrivateFieldGet(this, _MedplumClient_requestCache, "f").get(this.fhirUrl(resourceType, id).toString())) === null || _a === void 0 ? void 0 : _a.value;
+            const cached = __classPrivateFieldGet(this, _MedplumClient_requestCache, "f").get(this.fhirUrl(resourceType, id).toString())?.value;
             return cached && cached.isOk() ? cached.read() : undefined;
         }
         /**
@@ -7102,7 +7082,7 @@
          * @returns The resource if available; undefined otherwise.
          */
         readReference(reference, options = {}) {
-            const refString = reference === null || reference === void 0 ? void 0 : reference.reference;
+            const refString = reference?.reference;
             if (!refString) {
                 return new ReadablePromise(Promise.reject(new Error('Missing reference')));
             }
@@ -7130,12 +7110,11 @@
          * @param resourceType The FHIR resource type.
          * @returns Promise to a schema with the requested resource type.
          */
-        requestSchema(resourceType) {
-            return __awaiter(this, void 0, void 0, function* () {
-                if (resourceType in globalSchema.types) {
-                    return globalSchema;
-                }
-                const query = `{
+        async requestSchema(resourceType) {
+            if (resourceType in globalSchema.types) {
+                return globalSchema;
+            }
+            const query = `{
       StructureDefinitionList(name: "${resourceType}") {
         name,
         description,
@@ -7164,15 +7143,14 @@
         target
       }
     }`.replace(/\s+/g, ' ');
-                const response = (yield this.graphql(query));
-                for (const structureDefinition of response.data.StructureDefinitionList) {
-                    indexStructureDefinition(structureDefinition);
-                }
-                for (const searchParameter of response.data.SearchParameterList) {
-                    indexSearchParameter(searchParameter);
-                }
-                return globalSchema;
-            });
+            const response = (await this.graphql(query));
+            for (const structureDefinition of response.data.StructureDefinitionList) {
+                indexStructureDefinition(structureDefinition);
+            }
+            for (const searchParameter of response.data.SearchParameterList) {
+                indexSearchParameter(searchParameter);
+            }
+            return globalSchema;
         }
         /**
          * Reads resource history by resource type and ID.
@@ -7310,11 +7288,8 @@
          * @param query The search query for an equivalent resource (should not include resource type or "?").
          * @returns The result of the create operation.
          */
-        createResourceIfNoneExist(resource, query) {
-            var _a;
-            return __awaiter(this, void 0, void 0, function* () {
-                return ((_a = (yield this.searchOne(resource.resourceType, query))) !== null && _a !== void 0 ? _a : this.createResource(resource));
-            });
+        async createResourceIfNoneExist(resource, query) {
+            return ((await this.searchOne(resource.resourceType, query)) ?? this.createResource(resource));
         }
         /**
          * Creates a FHIR `Binary` resource with the provided data content.
@@ -7401,14 +7376,12 @@
          * @param docDefinition The PDF document definition.
          * @returns The result of the create operation.
          */
-        createPdf(docDefinition, filename, tableLayouts, fonts) {
-            return __awaiter(this, void 0, void 0, function* () {
-                if (!__classPrivateFieldGet(this, _MedplumClient_createPdf, "f")) {
-                    throw new Error('PDF creation not enabled');
-                }
-                const blob = yield __classPrivateFieldGet(this, _MedplumClient_createPdf, "f").call(this, docDefinition, tableLayouts, fonts);
-                return this.createBinary(blob, filename, 'application/pdf');
-            });
+        async createPdf(docDefinition, filename, tableLayouts, fonts) {
+            if (!__classPrivateFieldGet(this, _MedplumClient_createPdf, "f")) {
+                throw new Error('PDF creation not enabled');
+            }
+            const blob = await __classPrivateFieldGet(this, _MedplumClient_createPdf, "f").call(this, docDefinition, tableLayouts, fonts);
+            return this.createBinary(blob, filename, 'application/pdf');
         }
         /**
          * Creates a FHIR `Communication` resource with the provided data content.
@@ -7470,20 +7443,18 @@
          * @param resource The FHIR resource to update.
          * @returns The result of the update operation.
          */
-        updateResource(resource) {
-            return __awaiter(this, void 0, void 0, function* () {
-                if (!resource.resourceType) {
-                    throw new Error('Missing resourceType');
-                }
-                if (!resource.id) {
-                    throw new Error('Missing id');
-                }
-                this.invalidateSearches(resource.resourceType);
-                const result = yield this.put(this.fhirUrl(resource.resourceType, resource.id), resource);
-                // On 304 not modified, result will be undefined
-                // Return the user input instead
-                return result !== null && result !== void 0 ? result : resource;
-            });
+        async updateResource(resource) {
+            if (!resource.resourceType) {
+                throw new Error('Missing resourceType');
+            }
+            if (!resource.id) {
+                throw new Error('Missing id');
+            }
+            this.invalidateSearches(resource.resourceType);
+            const result = await this.put(this.fhirUrl(resource.resourceType, resource.id), resource);
+            // On 304 not modified, result will be undefined
+            // Return the user input instead
+            return result ?? resource;
         }
         /**
          * Updates a FHIR resource using JSONPatch operations.
@@ -7718,18 +7689,16 @@
         /**
          * @category Authentication
          */
-        setActiveLogin(login) {
-            return __awaiter(this, void 0, void 0, function* () {
-                __classPrivateFieldSet(this, _MedplumClient_accessToken, login.accessToken, "f");
-                __classPrivateFieldSet(this, _MedplumClient_refreshToken, login.refreshToken, "f");
-                __classPrivateFieldSet(this, _MedplumClient_profile, undefined, "f");
-                __classPrivateFieldSet(this, _MedplumClient_config, undefined, "f");
-                __classPrivateFieldGet(this, _MedplumClient_storage, "f").setObject('activeLogin', login);
-                __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_addLogin).call(this, login);
-                __classPrivateFieldGet(this, _MedplumClient_requestCache, "f").clear();
-                __classPrivateFieldSet(this, _MedplumClient_refreshPromise, undefined, "f");
-                yield __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_refreshProfile).call(this);
-            });
+        async setActiveLogin(login) {
+            __classPrivateFieldSet(this, _MedplumClient_accessToken, login.accessToken, "f");
+            __classPrivateFieldSet(this, _MedplumClient_refreshToken, login.refreshToken, "f");
+            __classPrivateFieldSet(this, _MedplumClient_profile, undefined, "f");
+            __classPrivateFieldSet(this, _MedplumClient_config, undefined, "f");
+            __classPrivateFieldGet(this, _MedplumClient_storage, "f").setObject('activeLogin', login);
+            __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_addLogin).call(this, login);
+            __classPrivateFieldGet(this, _MedplumClient_requestCache, "f").clear();
+            __classPrivateFieldSet(this, _MedplumClient_refreshPromise, undefined, "f");
+            await __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_refreshProfile).call(this);
         }
         /**
          * @category Authentication
@@ -7750,8 +7719,7 @@
          * @category Authentication
          */
         getLogins() {
-            var _a;
-            return (_a = __classPrivateFieldGet(this, _MedplumClient_storage, "f").getObject('logins')) !== null && _a !== void 0 ? _a : [];
+            return __classPrivateFieldGet(this, _MedplumClient_storage, "f").getObject('logins') ?? [];
         }
         /**
          * @category Authentication
@@ -7768,13 +7736,11 @@
         /**
          * @category User Profile
          */
-        getProfileAsync() {
-            return __awaiter(this, void 0, void 0, function* () {
-                if (__classPrivateFieldGet(this, _MedplumClient_profilePromise, "f")) {
-                    yield __classPrivateFieldGet(this, _MedplumClient_profilePromise, "f");
-                }
-                return this.getProfile();
-            });
+        async getProfileAsync() {
+            if (__classPrivateFieldGet(this, _MedplumClient_profilePromise, "f")) {
+                await __classPrivateFieldGet(this, _MedplumClient_profilePromise, "f");
+            }
+            return this.getProfile();
         }
         /**
          * @category User Profile
@@ -7789,30 +7755,26 @@
          * @param url The URL to request.
          * @returns Promise to the response body as a blob.
          */
-        download(url, options = {}) {
-            return __awaiter(this, void 0, void 0, function* () {
-                if (__classPrivateFieldGet(this, _MedplumClient_refreshPromise, "f")) {
-                    yield __classPrivateFieldGet(this, _MedplumClient_refreshPromise, "f");
-                }
-                __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_addFetchOptionsDefaults).call(this, options);
-                const response = yield __classPrivateFieldGet(this, _MedplumClient_fetch, "f").call(this, url.toString(), options);
-                return response.blob();
-            });
+        async download(url, options = {}) {
+            if (__classPrivateFieldGet(this, _MedplumClient_refreshPromise, "f")) {
+                await __classPrivateFieldGet(this, _MedplumClient_refreshPromise, "f");
+            }
+            __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_addFetchOptionsDefaults).call(this, options);
+            const response = await __classPrivateFieldGet(this, _MedplumClient_fetch, "f").call(this, url.toString(), options);
+            return response.blob();
         }
         /**
          * Starts a new PKCE flow.
          * These PKCE values are stateful, and must survive redirects and page refreshes.
          */
-        startPkce() {
-            return __awaiter(this, void 0, void 0, function* () {
-                const pkceState = getRandomString();
-                sessionStorage.setItem('pkceState', pkceState);
-                const codeVerifier = getRandomString();
-                sessionStorage.setItem('codeVerifier', codeVerifier);
-                const arrayHash = yield encryptSHA256(codeVerifier);
-                const codeChallenge = arrayBufferToBase64(arrayHash).replace(/\+/g, '-').replace(/\//g, '_').replace(/=/g, '');
-                sessionStorage.setItem('codeChallenge', codeChallenge);
-            });
+        async startPkce() {
+            const pkceState = getRandomString();
+            sessionStorage.setItem('pkceState', pkceState);
+            const codeVerifier = getRandomString();
+            sessionStorage.setItem('codeVerifier', codeVerifier);
+            const arrayHash = await encryptSHA256(codeVerifier);
+            const codeChallenge = arrayBufferToBase64(arrayHash).replace(/\+/g, '-').replace(/\//g, '_').replace(/=/g, '');
+            sessionStorage.setItem('codeChallenge', codeChallenge);
         }
         /**
          * Processes an OAuth authorization code.
@@ -7839,37 +7801,35 @@
          * @param clientSecret The client secret.
          * @returns Promise that resolves to the client profile.
          */
-        startClientLogin(clientId, clientSecret) {
-            return __awaiter(this, void 0, void 0, function* () {
-                const formBody = new URLSearchParams();
-                formBody.set('grant_type', 'client_credentials');
-                formBody.set('client_id', clientId);
-                formBody.set('client_secret', clientSecret);
-                return __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_fetchTokens).call(this, formBody);
-            });
+        async startClientLogin(clientId, clientSecret) {
+            __classPrivateFieldSet(this, _MedplumClient_clientId, clientId, "f");
+            __classPrivateFieldSet(this, _MedplumClient_clientSecret, clientSecret, "f");
+            const formBody = new URLSearchParams();
+            formBody.set('grant_type', 'client_credentials');
+            formBody.set('client_id', clientId);
+            formBody.set('client_secret', clientSecret);
+            return __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_fetchTokens).call(this, formBody);
         }
     }
-    _MedplumClient_fetch = new WeakMap(), _MedplumClient_createPdf = new WeakMap(), _MedplumClient_storage = new WeakMap(), _MedplumClient_requestCache = new WeakMap(), _MedplumClient_cacheTime = new WeakMap(), _MedplumClient_baseUrl = new WeakMap(), _MedplumClient_clientId = new WeakMap(), _MedplumClient_authorizeUrl = new WeakMap(), _MedplumClient_tokenUrl = new WeakMap(), _MedplumClient_logoutUrl = new WeakMap(), _MedplumClient_onUnauthenticated = new WeakMap(), _MedplumClient_accessToken = new WeakMap(), _MedplumClient_refreshToken = new WeakMap(), _MedplumClient_refreshPromise = new WeakMap(), _MedplumClient_profilePromise = new WeakMap(), _MedplumClient_profile = new WeakMap(), _MedplumClient_config = new WeakMap(), _MedplumClient_instances = new WeakSet(), _MedplumClient_addLogin = function _MedplumClient_addLogin(newLogin) {
-        const logins = this.getLogins().filter((login) => { var _a, _b; return ((_a = login.profile) === null || _a === void 0 ? void 0 : _a.reference) !== ((_b = newLogin.profile) === null || _b === void 0 ? void 0 : _b.reference); });
+    _MedplumClient_fetch = new WeakMap(), _MedplumClient_createPdf = new WeakMap(), _MedplumClient_storage = new WeakMap(), _MedplumClient_requestCache = new WeakMap(), _MedplumClient_cacheTime = new WeakMap(), _MedplumClient_baseUrl = new WeakMap(), _MedplumClient_authorizeUrl = new WeakMap(), _MedplumClient_tokenUrl = new WeakMap(), _MedplumClient_logoutUrl = new WeakMap(), _MedplumClient_onUnauthenticated = new WeakMap(), _MedplumClient_clientId = new WeakMap(), _MedplumClient_clientSecret = new WeakMap(), _MedplumClient_accessToken = new WeakMap(), _MedplumClient_refreshToken = new WeakMap(), _MedplumClient_refreshPromise = new WeakMap(), _MedplumClient_profilePromise = new WeakMap(), _MedplumClient_profile = new WeakMap(), _MedplumClient_config = new WeakMap(), _MedplumClient_instances = new WeakSet(), _MedplumClient_addLogin = function _MedplumClient_addLogin(newLogin) {
+        const logins = this.getLogins().filter((login) => login.profile?.reference !== newLogin.profile?.reference);
         logins.push(newLogin);
         __classPrivateFieldGet(this, _MedplumClient_storage, "f").setObject('logins', logins);
-    }, _MedplumClient_refreshProfile = function _MedplumClient_refreshProfile() {
-        return __awaiter(this, void 0, void 0, function* () {
-            __classPrivateFieldSet(this, _MedplumClient_profilePromise, new Promise((resolve, reject) => {
-                this.get('auth/me')
-                    .then((result) => {
-                    __classPrivateFieldSet(this, _MedplumClient_profilePromise, undefined, "f");
-                    __classPrivateFieldSet(this, _MedplumClient_profile, result.profile, "f");
-                    __classPrivateFieldSet(this, _MedplumClient_config, result.config, "f");
-                    this.dispatchEvent({ type: 'change' });
-                    resolve(__classPrivateFieldGet(this, _MedplumClient_profile, "f"));
-                })
-                    .catch(reject);
-            }), "f");
-            return __classPrivateFieldGet(this, _MedplumClient_profilePromise, "f");
-        });
+    }, _MedplumClient_refreshProfile = async function _MedplumClient_refreshProfile() {
+        __classPrivateFieldSet(this, _MedplumClient_profilePromise, new Promise((resolve, reject) => {
+            this.get('auth/me')
+                .then((result) => {
+                __classPrivateFieldSet(this, _MedplumClient_profilePromise, undefined, "f");
+                __classPrivateFieldSet(this, _MedplumClient_profile, result.profile, "f");
+                __classPrivateFieldSet(this, _MedplumClient_config, result.config, "f");
+                this.dispatchEvent({ type: 'change' });
+                resolve(__classPrivateFieldGet(this, _MedplumClient_profile, "f"));
+            })
+                .catch(reject);
+        }), "f");
+        return __classPrivateFieldGet(this, _MedplumClient_profilePromise, "f");
     }, _MedplumClient_getCacheEntry = function _MedplumClient_getCacheEntry(key, options) {
-        if (__classPrivateFieldGet(this, _MedplumClient_cacheTime, "f") <= 0 || (options === null || options === void 0 ? void 0 : options.cache) === 'no-cache' || (options === null || options === void 0 ? void 0 : options.cache) === 'reload') {
+        if (__classPrivateFieldGet(this, _MedplumClient_cacheTime, "f") <= 0 || options?.cache === 'no-cache' || options?.cache === 'reload') {
             return undefined;
         }
         const entry = __classPrivateFieldGet(this, _MedplumClient_requestCache, "f").get(key);
@@ -7881,31 +7841,37 @@
         if (__classPrivateFieldGet(this, _MedplumClient_cacheTime, "f") > 0) {
             __classPrivateFieldGet(this, _MedplumClient_requestCache, "f").set(key, { requestTime: Date.now(), value });
         }
-    }, _MedplumClient_request = function _MedplumClient_request(method, url, options = {}) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (__classPrivateFieldGet(this, _MedplumClient_refreshPromise, "f")) {
-                yield __classPrivateFieldGet(this, _MedplumClient_refreshPromise, "f");
-            }
-            if (!url.startsWith('http')) {
-                url = __classPrivateFieldGet(this, _MedplumClient_baseUrl, "f") + url;
-            }
-            options.method = method;
-            __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_addFetchOptionsDefaults).call(this, options);
-            const response = yield __classPrivateFieldGet(this, _MedplumClient_fetch, "f").call(this, url, options);
-            if (response.status === 401) {
-                // Refresh and try again
-                return __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_handleUnauthenticated).call(this, method, url, options);
-            }
-            if (response.status === 204 || response.status === 304) {
-                // No content or change
-                return undefined;
-            }
-            const obj = yield response.json();
-            if (response.status >= 400) {
-                throw obj;
-            }
-            return obj;
-        });
+    }, _MedplumClient_request = 
+    /**
+     * Makes an HTTP request.
+     * @param {string} method
+     * @param {string} url
+     * @param {string=} contentType
+     * @param {Object=} body
+     */
+    async function _MedplumClient_request(method, url, options = {}) {
+        if (__classPrivateFieldGet(this, _MedplumClient_refreshPromise, "f")) {
+            await __classPrivateFieldGet(this, _MedplumClient_refreshPromise, "f");
+        }
+        if (!url.startsWith('http')) {
+            url = __classPrivateFieldGet(this, _MedplumClient_baseUrl, "f") + url;
+        }
+        options.method = method;
+        __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_addFetchOptionsDefaults).call(this, options);
+        const response = await __classPrivateFieldGet(this, _MedplumClient_fetch, "f").call(this, url, options);
+        if (response.status === 401) {
+            // Refresh and try again
+            return __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_handleUnauthenticated).call(this, method, url, options);
+        }
+        if (response.status === 204 || response.status === 304) {
+            // No content or change
+            return undefined;
+        }
+        const obj = await response.json();
+        if (response.status >= 400) {
+            throw obj;
+        }
+        return obj;
     }, _MedplumClient_addFetchOptionsDefaults = function _MedplumClient_addFetchOptionsDefaults(options) {
         if (!options.headers) {
             options.headers = {};
@@ -7941,82 +7907,93 @@
             options.body = JSON.stringify(data);
         }
     }, _MedplumClient_handleUnauthenticated = function _MedplumClient_handleUnauthenticated(method, url, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_refresh).call(this)
-                .then(() => __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_request).call(this, method, url, options))
-                .catch((error) => {
-                this.clear();
-                if (__classPrivateFieldGet(this, _MedplumClient_onUnauthenticated, "f")) {
-                    __classPrivateFieldGet(this, _MedplumClient_onUnauthenticated, "f").call(this);
-                }
-                return Promise.reject(error);
-            });
-        });
-    }, _MedplumClient_requestAuthorization = function _MedplumClient_requestAuthorization() {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.startPkce();
-            const url = new URL(__classPrivateFieldGet(this, _MedplumClient_authorizeUrl, "f"));
-            url.searchParams.set('response_type', 'code');
-            url.searchParams.set('state', sessionStorage.getItem('pkceState'));
-            url.searchParams.set('client_id', __classPrivateFieldGet(this, _MedplumClient_clientId, "f"));
-            url.searchParams.set('redirect_uri', getBaseUrl());
-            url.searchParams.set('code_challenge_method', 'S256');
-            url.searchParams.set('code_challenge', sessionStorage.getItem('codeChallenge'));
-            window.location.assign(url.toString());
-        });
+        if (__classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_refresh).call(this)) {
+            return __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_request).call(this, method, url, options);
+        }
+        this.clear();
+        if (__classPrivateFieldGet(this, _MedplumClient_onUnauthenticated, "f")) {
+            __classPrivateFieldGet(this, _MedplumClient_onUnauthenticated, "f").call(this);
+        }
+        return Promise.reject(new Error('Unauthenticated'));
+    }, _MedplumClient_requestAuthorization = 
+    /**
+     * Redirects the user to the login screen for authorization.
+     * Clears all auth state including local storage and session storage.
+     * See: https://openid.net/specs/openid-connect-core-1_0.html#AuthorizationEndpoint
+     */
+    async function _MedplumClient_requestAuthorization() {
+        await this.startPkce();
+        const url = new URL(__classPrivateFieldGet(this, _MedplumClient_authorizeUrl, "f"));
+        url.searchParams.set('response_type', 'code');
+        url.searchParams.set('state', sessionStorage.getItem('pkceState'));
+        url.searchParams.set('client_id', __classPrivateFieldGet(this, _MedplumClient_clientId, "f"));
+        url.searchParams.set('redirect_uri', getBaseUrl());
+        url.searchParams.set('code_challenge_method', 'S256');
+        url.searchParams.set('code_challenge', sessionStorage.getItem('codeChallenge'));
+        window.location.assign(url.toString());
     }, _MedplumClient_refresh = function _MedplumClient_refresh() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (__classPrivateFieldGet(this, _MedplumClient_refreshPromise, "f")) {
-                return __classPrivateFieldGet(this, _MedplumClient_refreshPromise, "f");
-            }
-            if (!__classPrivateFieldGet(this, _MedplumClient_refreshToken, "f")) {
-                this.clear();
-                throw new Error('Invalid refresh token');
-            }
+        if (__classPrivateFieldGet(this, _MedplumClient_refreshPromise, "f")) {
+            return __classPrivateFieldGet(this, _MedplumClient_refreshPromise, "f");
+        }
+        if (__classPrivateFieldGet(this, _MedplumClient_refreshToken, "f")) {
             const formBody = new URLSearchParams();
             formBody.set('grant_type', 'refresh_token');
             formBody.set('client_id', __classPrivateFieldGet(this, _MedplumClient_clientId, "f"));
             formBody.set('refresh_token', __classPrivateFieldGet(this, _MedplumClient_refreshToken, "f"));
             __classPrivateFieldSet(this, _MedplumClient_refreshPromise, __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_fetchTokens).call(this, formBody), "f");
-            yield __classPrivateFieldGet(this, _MedplumClient_refreshPromise, "f");
-        });
-    }, _MedplumClient_fetchTokens = function _MedplumClient_fetchTokens(formBody) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return __classPrivateFieldGet(this, _MedplumClient_fetch, "f").call(this, __classPrivateFieldGet(this, _MedplumClient_tokenUrl, "f"), {
-                method: 'POST',
-                headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
-                body: formBody,
-                credentials: 'include',
-            })
-                .then((response) => {
-                if (!response.ok) {
-                    throw new Error('Failed to fetch tokens');
-                }
-                return response.json();
-            })
-                .then((tokens) => __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_verifyTokens).call(this, tokens))
-                .then(() => this.getProfile());
-        });
-    }, _MedplumClient_verifyTokens = function _MedplumClient_verifyTokens(tokens) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const token = tokens.access_token;
-            // Verify token has not expired
-            const tokenPayload = parseJWTPayload(token);
-            if (Date.now() >= tokenPayload.exp * 1000) {
-                this.clear();
-                throw new Error('Token expired');
-            }
-            // Verify app_client_id
-            if (__classPrivateFieldGet(this, _MedplumClient_clientId, "f") && tokenPayload.client_id !== __classPrivateFieldGet(this, _MedplumClient_clientId, "f")) {
-                this.clear();
-                throw new Error('Token was not issued for this audience');
-            }
-            yield this.setActiveLogin({
-                accessToken: token,
-                refreshToken: tokens.refresh_token,
-                project: tokens.project,
-                profile: tokens.profile,
-            });
+            return __classPrivateFieldGet(this, _MedplumClient_refreshPromise, "f");
+        }
+        if (__classPrivateFieldGet(this, _MedplumClient_clientId, "f") && __classPrivateFieldGet(this, _MedplumClient_clientSecret, "f")) {
+            __classPrivateFieldSet(this, _MedplumClient_refreshPromise, this.startClientLogin(__classPrivateFieldGet(this, _MedplumClient_clientId, "f"), __classPrivateFieldGet(this, _MedplumClient_clientSecret, "f")), "f");
+            return __classPrivateFieldGet(this, _MedplumClient_refreshPromise, "f");
+        }
+        return undefined;
+    }, _MedplumClient_fetchTokens = 
+    /**
+     * Makes a POST request to the tokens endpoint.
+     * See: https://openid.net/specs/openid-connect-core-1_0.html#TokenEndpoint
+     * @param formBody Token parameters in URL encoded format.
+     */
+    async function _MedplumClient_fetchTokens(formBody) {
+        return __classPrivateFieldGet(this, _MedplumClient_fetch, "f").call(this, __classPrivateFieldGet(this, _MedplumClient_tokenUrl, "f"), {
+            method: 'POST',
+            headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+            body: formBody,
+            credentials: 'include',
+        })
+            .then((response) => {
+            if (!response.ok) {
+                throw new Error('Failed to fetch tokens');
+            }
+            return response.json();
+        })
+            .then((tokens) => __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_verifyTokens).call(this, tokens))
+            .then(() => this.getProfile());
+    }, _MedplumClient_verifyTokens = 
+    /**
+     * Verifies the tokens received from the auth server.
+     * Validates the JWT against the JWKS.
+     * See: https://openid.net/specs/openid-connect-core-1_0.html#TokenEndpoint
+     * @param tokens
+     */
+    async function _MedplumClient_verifyTokens(tokens) {
+        const token = tokens.access_token;
+        // Verify token has not expired
+        const tokenPayload = parseJWTPayload(token);
+        if (Date.now() >= tokenPayload.exp * 1000) {
+            this.clear();
+            throw new Error('Token expired');
+        }
+        // Verify app_client_id
+        if (__classPrivateFieldGet(this, _MedplumClient_clientId, "f") && tokenPayload.client_id !== __classPrivateFieldGet(this, _MedplumClient_clientId, "f")) {
+            this.clear();
+            throw new Error('Token was not issued for this audience');
+        }
+        await this.setActiveLogin({
+            accessToken: token,
+            refreshToken: tokens.refresh_token,
+            project: tokens.project,
+            profile: tokens.profile,
         });
     }, _MedplumClient_setupStorageListener = function _MedplumClient_setupStorageListener() {
         try {
@@ -8047,110 +8024,443 @@
         return url.endsWith('/') ? url : url + '/';
     }
 
-    function parseDateString(str) {
-        if (str.startsWith('T')) {
-            // If a time string,
-            // then normalize to full length.
-            return str + 'T00:00:00.000Z'.substring(str.length);
+    var _ParserBuilder_prefixParselets, _ParserBuilder_infixParselets, _Parser_tokens, _Parser_prefixParselets, _Parser_infixParselets;
+    class PrefixOperatorAtom {
+        constructor(operator, child) {
+            this.operator = operator;
+            this.child = child;
         }
-        if (str.length <= 10) {
-            // If a local date (i.e., "2021-01-01"),
-            // then return as-is.
-            return str;
+        toString() {
+            return `${this.operator}(${this.child.toString()})`;
         }
-        try {
-            // Try to normalize to UTC
-            return new Date(str).toISOString();
+    }
+    class InfixOperatorAtom {
+        constructor(operator, left, right) {
+            this.operator = operator;
+            this.left = left;
+            this.right = right;
         }
-        catch (e) {
-            // Fallback to original input
-            // This happens on unsupported time formats such as "2021-01-01T12"
-            return str;
+        toString() {
+            return `${this.left.toString()} ${this.operator} ${this.right.toString()}`;
         }
     }
-
-    /**
-     * Returns a single element array with a typed boolean value.
-     * @param value The primitive boolean value.
-     * @returns Single element array with a typed boolean value.
-     */
-    function booleanToTypedValue(value) {
-        return [{ type: exports.PropertyType.boolean, value }];
-    }
-    /**
-     * Returns a "best guess" TypedValue for a given value.
-     * @param value The unknown value to check.
-     * @returns A "best guess" TypedValue for the given value.
-     */
-    function toTypedValue(value) {
-        if (value === null || value === undefined) {
-            return { type: 'undefined', value: undefined };
+    class ParserBuilder {
+        constructor() {
+            _ParserBuilder_prefixParselets.set(this, {});
+            _ParserBuilder_infixParselets.set(this, {});
         }
-        else if (Number.isSafeInteger(value)) {
-            return { type: exports.PropertyType.integer, value };
+        registerInfix(tokenType, parselet) {
+            __classPrivateFieldGet(this, _ParserBuilder_infixParselets, "f")[tokenType] = parselet;
+            return this;
         }
-        else if (typeof value === 'number') {
-            return { type: exports.PropertyType.decimal, value };
+        registerPrefix(tokenType, parselet) {
+            __classPrivateFieldGet(this, _ParserBuilder_prefixParselets, "f")[tokenType] = parselet;
+            return this;
         }
-        else if (typeof value === 'boolean') {
-            return { type: exports.PropertyType.boolean, value };
+        prefix(tokenType, precedence, builder) {
+            return this.registerPrefix(tokenType, {
+                parse(parser, token) {
+                    const right = parser.consumeAndParse(precedence);
+                    return builder(token, right);
+                },
+            });
         }
-        else if (typeof value === 'string') {
-            return { type: exports.PropertyType.string, value };
+        infixLeft(tokenType, precedence, builder) {
+            return this.registerInfix(tokenType, {
+                parse(parser, left, token) {
+                    const right = parser.consumeAndParse(precedence);
+                    return builder(left, token, right);
+                },
+                precedence,
+            });
         }
-        else if (isQuantity(value)) {
-            return { type: exports.PropertyType.Quantity, value };
+        construct(input) {
+            return new Parser(input, __classPrivateFieldGet(this, _ParserBuilder_prefixParselets, "f"), __classPrivateFieldGet(this, _ParserBuilder_infixParselets, "f"));
         }
-        else if (typeof value === 'object' && 'resourceType' in value) {
-            return { type: value.resourceType, value };
+    }
+    _ParserBuilder_prefixParselets = new WeakMap(), _ParserBuilder_infixParselets = new WeakMap();
+    class Parser {
+        constructor(tokens, prefixParselets, infixParselets) {
+            _Parser_tokens.set(this, void 0);
+            _Parser_prefixParselets.set(this, void 0);
+            _Parser_infixParselets.set(this, void 0);
+            __classPrivateFieldSet(this, _Parser_tokens, tokens, "f");
+            __classPrivateFieldSet(this, _Parser_prefixParselets, prefixParselets, "f");
+            __classPrivateFieldSet(this, _Parser_infixParselets, infixParselets, "f");
         }
-        else {
-            return { type: exports.PropertyType.BackboneElement, value };
+        hasMore() {
+            return __classPrivateFieldGet(this, _Parser_tokens, "f").length > 0;
         }
-    }
-    /**
-     * Converts unknown object into a JavaScript boolean.
-     * Note that this is different than the FHIRPath "toBoolean",
-     * which has particular semantics around arrays, empty arrays, and type conversions.
-     * @param obj Any value or array of values.
-     * @returns The converted boolean value according to FHIRPath rules.
-     */
-    function toJsBoolean(obj) {
-        return obj.length === 0 ? false : !!obj[0].value;
-    }
-    /**
-     * Returns the value of the property and the property type.
-     * Some property definitions support multiple types.
-     * For example, "Observation.value[x]" can be "valueString", "valueInteger", "valueQuantity", etc.
-     * According to the spec, there can only be one property for a given element definition.
-     * This function returns the value and the type.
-     * @param input The base context (FHIR resource or backbone element).
-     * @param path The property path.
-     * @returns The value of the property and the property type.
-     */
-    function getTypedPropertyValue(input, path) {
-        if (!(input === null || input === void 0 ? void 0 : input.value)) {
-            return undefined;
+        match(expected) {
+            const token = this.peek();
+            if (token?.id !== expected) {
+                return false;
+            }
+            this.consume();
+            return true;
         }
-        const elementDefinition = getElementDefinition(input.type, path);
-        if (elementDefinition) {
-            const typedResult = getTypedPropertyValueWithSchema(input, path, elementDefinition);
-            if (typedResult) {
-                return typedResult;
+        consumeAndParse(precedence = Infinity) {
+            const token = this.consume();
+            const prefix = __classPrivateFieldGet(this, _Parser_prefixParselets, "f")[token.id];
+            if (!prefix) {
+                throw Error(`Parse error at "${token.value}" (line ${token.line}, column ${token.column}). No matching prefix parselet.`);
+            }
+            let left = prefix.parse(this, token);
+            while (precedence > this.getPrecedence()) {
+                const next = this.consume();
+                const infix = this.getInfixParselet(next);
+                left = infix.parse(this, left, next);
             }
+            return left;
         }
-        return getTypedPropertyValueWithoutSchema(input, path);
-    }
-    /**
-     * Returns the value of the property and the property type using a type schema.
-     * @param input The base context (FHIR resource or backbone element).
-     * @param path The property path.
-     * @param property The property element definition.
-     * @returns The value of the property and the property type.
-     */
-    function getTypedPropertyValueWithSchema(input, path, property) {
-        var _a;
-        const types = property.type;
+        getPrecedence() {
+            const nextToken = this.peek();
+            if (!nextToken) {
+                return Infinity;
+            }
+            const parser = this.getInfixParselet(nextToken);
+            if (parser) {
+                return parser.precedence;
+            }
+            return Infinity;
+        }
+        consume(expectedId, expectedValue) {
+            if (!__classPrivateFieldGet(this, _Parser_tokens, "f").length) {
+                throw Error('Cant consume unknown more tokens.');
+            }
+            if (expectedId && this.peek()?.id !== expectedId) {
+                const actual = this.peek();
+                throw Error(`Expected ${expectedId} but got "${actual.id}" at line ${actual.line} column ${actual.column}.`);
+            }
+            if (expectedValue && this.peek()?.value !== expectedValue) {
+                const actual = this.peek();
+                throw Error(`Expected "${expectedValue}" but got "${actual.value}" at line ${actual.line} column ${actual.column}.`);
+            }
+            return __classPrivateFieldGet(this, _Parser_tokens, "f").shift();
+        }
+        peek() {
+            return __classPrivateFieldGet(this, _Parser_tokens, "f").length > 0 ? __classPrivateFieldGet(this, _Parser_tokens, "f")[0] : undefined;
+        }
+        removeComments() {
+            __classPrivateFieldSet(this, _Parser_tokens, __classPrivateFieldGet(this, _Parser_tokens, "f").filter((t) => t.id !== 'Comment'), "f");
+        }
+        getInfixParselet(token) {
+            return __classPrivateFieldGet(this, _Parser_infixParselets, "f")[token.id === 'Symbol' ? token.value : token.id];
+        }
+    }
+    _Parser_tokens = new WeakMap(), _Parser_prefixParselets = new WeakMap(), _Parser_infixParselets = new WeakMap();
+
+    var _Tokenizer_instances, _Tokenizer_str, _Tokenizer_keywords, _Tokenizer_operators, _Tokenizer_result, _Tokenizer_pos, _Tokenizer_markStack, _Tokenizer_prevToken, _Tokenizer_peekToken, _Tokenizer_consumeToken, _Tokenizer_consumeWhitespace, _Tokenizer_consumeMultiLineComment, _Tokenizer_consumeSingleLineComment, _Tokenizer_consumeString, _Tokenizer_consumeBacktickSymbol, _Tokenizer_consumeDateTime, _Tokenizer_consumeNumber, _Tokenizer_consumeSymbol, _Tokenizer_consumeOperator, _Tokenizer_consumeWhile, _Tokenizer_curr, _Tokenizer_prev, _Tokenizer_peek, _Tokenizer_mark, _Tokenizer_reset, _Tokenizer_advance, _Tokenizer_buildToken;
+    const STANDARD_UNITS = [
+        'year',
+        'years',
+        'month',
+        'months',
+        'week',
+        'weeks',
+        'day',
+        'days',
+        'hour',
+        'hours',
+        'minute',
+        'minutes',
+        'second',
+        'seconds',
+        'millisecond',
+        'milliseconds',
+    ];
+    class Tokenizer {
+        constructor(str, keywords, operators) {
+            _Tokenizer_instances.add(this);
+            _Tokenizer_str.set(this, void 0);
+            _Tokenizer_keywords.set(this, void 0);
+            _Tokenizer_operators.set(this, void 0);
+            _Tokenizer_result.set(this, []);
+            _Tokenizer_pos.set(this, { index: 0, line: 1, column: 0 });
+            _Tokenizer_markStack.set(this, []);
+            __classPrivateFieldSet(this, _Tokenizer_str, str, "f");
+            __classPrivateFieldSet(this, _Tokenizer_keywords, keywords, "f");
+            __classPrivateFieldSet(this, _Tokenizer_operators, operators, "f");
+        }
+        tokenize() {
+            while (__classPrivateFieldGet(this, _Tokenizer_pos, "f").index < __classPrivateFieldGet(this, _Tokenizer_str, "f").length) {
+                const token = __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeToken).call(this);
+                if (token) {
+                    __classPrivateFieldGet(this, _Tokenizer_result, "f").push(token);
+                }
+            }
+            return __classPrivateFieldGet(this, _Tokenizer_result, "f");
+        }
+    }
+    _Tokenizer_str = new WeakMap(), _Tokenizer_keywords = new WeakMap(), _Tokenizer_operators = new WeakMap(), _Tokenizer_result = new WeakMap(), _Tokenizer_pos = new WeakMap(), _Tokenizer_markStack = new WeakMap(), _Tokenizer_instances = new WeakSet(), _Tokenizer_prevToken = function _Tokenizer_prevToken() {
+        return __classPrivateFieldGet(this, _Tokenizer_result, "f").slice(-1)[0];
+    }, _Tokenizer_peekToken = function _Tokenizer_peekToken() {
+        __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_mark).call(this);
+        const token = __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeToken).call(this);
+        __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_reset).call(this);
+        return token;
+    }, _Tokenizer_consumeToken = function _Tokenizer_consumeToken() {
+        __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeWhitespace).call(this);
+        const c = __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this);
+        if (!c) {
+            return undefined;
+        }
+        __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_mark).call(this);
+        const next = __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_peek).call(this);
+        if (c === '/' && next === '*') {
+            return __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeMultiLineComment).call(this);
+        }
+        if (c === '/' && next === '/') {
+            return __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeSingleLineComment).call(this);
+        }
+        if (c === "'" || c === '"') {
+            return __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeString).call(this, c);
+        }
+        if (c === '`') {
+            return __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeBacktickSymbol).call(this);
+        }
+        if (c === '@') {
+            return __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeDateTime).call(this);
+        }
+        if (c.match(/\d/)) {
+            return __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeNumber).call(this);
+        }
+        if (c.match(/\w/)) {
+            return __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeSymbol).call(this);
+        }
+        if (c === '$' && next.match(/\w/)) {
+            return __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeSymbol).call(this);
+        }
+        return __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeOperator).call(this);
+    }, _Tokenizer_consumeWhitespace = function _Tokenizer_consumeWhitespace() {
+        __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeWhile).call(this, () => __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this).match(/\s/));
+    }, _Tokenizer_consumeMultiLineComment = function _Tokenizer_consumeMultiLineComment() {
+        const start = __classPrivateFieldGet(this, _Tokenizer_pos, "f").index;
+        __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeWhile).call(this, () => __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this) !== '*' || __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_peek).call(this) !== '/');
+        __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_advance).call(this);
+        __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_advance).call(this);
+        return __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_buildToken).call(this, 'Comment', __classPrivateFieldGet(this, _Tokenizer_str, "f").substring(start, __classPrivateFieldGet(this, _Tokenizer_pos, "f").index));
+    }, _Tokenizer_consumeSingleLineComment = function _Tokenizer_consumeSingleLineComment() {
+        return __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_buildToken).call(this, 'Comment', __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeWhile).call(this, () => __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this) !== '\n'));
+    }, _Tokenizer_consumeString = function _Tokenizer_consumeString(endChar) {
+        __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_advance).call(this);
+        const result = __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_buildToken).call(this, 'String', __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeWhile).call(this, () => __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_prev).call(this) === '\\' || __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this) !== endChar));
+        __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_advance).call(this);
+        return result;
+    }, _Tokenizer_consumeBacktickSymbol = function _Tokenizer_consumeBacktickSymbol() {
+        __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_advance).call(this);
+        const result = __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_buildToken).call(this, 'Symbol', __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeWhile).call(this, () => __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this) !== '`'));
+        __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_advance).call(this);
+        return result;
+    }, _Tokenizer_consumeDateTime = function _Tokenizer_consumeDateTime() {
+        __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_advance).call(this); // Consume "@"
+        const start = __classPrivateFieldGet(this, _Tokenizer_pos, "f").index;
+        __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeWhile).call(this, () => __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this).match(/[\d-]/));
+        if (__classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this) === 'T') {
+            __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_advance).call(this);
+            __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeWhile).call(this, () => __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this).match(/[\d:]/));
+            if (__classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this) === '.' && __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_peek).call(this).match(/\d/)) {
+                __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_advance).call(this);
+                __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeWhile).call(this, () => __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this).match(/\d/));
+            }
+            if (__classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this) === 'Z') {
+                __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_advance).call(this);
+            }
+            else if (__classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this) === '+' || __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this) === '-') {
+                __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_advance).call(this);
+                __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeWhile).call(this, () => __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this).match(/[\d:]/));
+            }
+        }
+        return __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_buildToken).call(this, 'DateTime', __classPrivateFieldGet(this, _Tokenizer_str, "f").substring(start, __classPrivateFieldGet(this, _Tokenizer_pos, "f").index));
+    }, _Tokenizer_consumeNumber = function _Tokenizer_consumeNumber() {
+        const start = __classPrivateFieldGet(this, _Tokenizer_pos, "f").index;
+        let id = 'Number';
+        __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeWhile).call(this, () => __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this).match(/\d/));
+        if (__classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this) === '.' && __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_peek).call(this).match(/\d/)) {
+            __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_advance).call(this);
+            __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeWhile).call(this, () => __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this).match(/\d/));
+        }
+        if (__classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this) === ' ') {
+            if (isUnitToken(__classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_peekToken).call(this))) {
+                id = 'Quantity';
+                __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeToken).call(this);
+            }
+        }
+        return __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_buildToken).call(this, id, __classPrivateFieldGet(this, _Tokenizer_str, "f").substring(start, __classPrivateFieldGet(this, _Tokenizer_pos, "f").index));
+    }, _Tokenizer_consumeSymbol = function _Tokenizer_consumeSymbol() {
+        const value = __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeWhile).call(this, () => __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this).match(/[$\w]/));
+        if (__classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_prevToken).call(this)?.value !== '.' && __classPrivateFieldGet(this, _Tokenizer_keywords, "f").includes(value)) {
+            return __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_buildToken).call(this, value, value);
+        }
+        return __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_buildToken).call(this, 'Symbol', value);
+    }, _Tokenizer_consumeOperator = function _Tokenizer_consumeOperator() {
+        const c = __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this);
+        const next = __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_peek).call(this);
+        const twoCharOp = c + next;
+        if (__classPrivateFieldGet(this, _Tokenizer_operators, "f").includes(twoCharOp)) {
+            __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_advance).call(this);
+            __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_advance).call(this);
+            return __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_buildToken).call(this, twoCharOp, twoCharOp);
+        }
+        __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_advance).call(this);
+        return __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_buildToken).call(this, c, c);
+    }, _Tokenizer_consumeWhile = function _Tokenizer_consumeWhile(condition) {
+        const start = __classPrivateFieldGet(this, _Tokenizer_pos, "f").index;
+        while (__classPrivateFieldGet(this, _Tokenizer_pos, "f").index < __classPrivateFieldGet(this, _Tokenizer_str, "f").length && condition()) {
+            __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_advance).call(this);
+        }
+        return __classPrivateFieldGet(this, _Tokenizer_str, "f").substring(start, __classPrivateFieldGet(this, _Tokenizer_pos, "f").index);
+    }, _Tokenizer_curr = function _Tokenizer_curr() {
+        return __classPrivateFieldGet(this, _Tokenizer_str, "f")[__classPrivateFieldGet(this, _Tokenizer_pos, "f").index];
+    }, _Tokenizer_prev = function _Tokenizer_prev() {
+        return __classPrivateFieldGet(this, _Tokenizer_str, "f")[__classPrivateFieldGet(this, _Tokenizer_pos, "f").index - 1] ?? '';
+    }, _Tokenizer_peek = function _Tokenizer_peek() {
+        return __classPrivateFieldGet(this, _Tokenizer_str, "f")[__classPrivateFieldGet(this, _Tokenizer_pos, "f").index + 1] ?? '';
+    }, _Tokenizer_mark = function _Tokenizer_mark() {
+        __classPrivateFieldGet(this, _Tokenizer_markStack, "f").push({ ...__classPrivateFieldGet(this, _Tokenizer_pos, "f") });
+    }, _Tokenizer_reset = function _Tokenizer_reset() {
+        const mark = __classPrivateFieldGet(this, _Tokenizer_markStack, "f").pop();
+        if (!mark) {
+            throw new Error('No mark to reset to');
+        }
+        __classPrivateFieldGet(this, _Tokenizer_pos, "f").index = mark.index;
+        __classPrivateFieldGet(this, _Tokenizer_pos, "f").line = mark.line;
+        __classPrivateFieldGet(this, _Tokenizer_pos, "f").column = mark.column;
+    }, _Tokenizer_advance = function _Tokenizer_advance() {
+        __classPrivateFieldGet(this, _Tokenizer_pos, "f").index++;
+        if (__classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this) === '\n') {
+            __classPrivateFieldGet(this, _Tokenizer_pos, "f").line++;
+            __classPrivateFieldGet(this, _Tokenizer_pos, "f").column = 0;
+        }
+        else {
+            __classPrivateFieldGet(this, _Tokenizer_pos, "f").column++;
+        }
+    }, _Tokenizer_buildToken = function _Tokenizer_buildToken(id, value) {
+        const mark = __classPrivateFieldGet(this, _Tokenizer_markStack, "f").pop();
+        if (!mark) {
+            throw new Error('No mark for token');
+        }
+        return {
+            id,
+            value,
+            ...mark,
+        };
+    };
+    function isUnitToken(token) {
+        if (token) {
+            if (token.id === 'String') {
+                return true;
+            }
+            if (token.id === 'Symbol' && STANDARD_UNITS.includes(token.value)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    function parseDateString(str) {
+        if (str.startsWith('T')) {
+            // If a time string,
+            // then normalize to full length.
+            return str + 'T00:00:00.000Z'.substring(str.length);
+        }
+        if (str.length <= 10) {
+            // If a local date (i.e., "2021-01-01"),
+            // then return as-is.
+            return str;
+        }
+        try {
+            // Try to normalize to UTC
+            return new Date(str).toISOString();
+        }
+        catch (e) {
+            // Fallback to original input
+            // This happens on unsupported time formats such as "2021-01-01T12"
+            return str;
+        }
+    }
+
+    /**
+     * Returns a single element array with a typed boolean value.
+     * @param value The primitive boolean value.
+     * @returns Single element array with a typed boolean value.
+     */
+    function booleanToTypedValue(value) {
+        return [{ type: exports.PropertyType.boolean, value }];
+    }
+    /**
+     * Returns a "best guess" TypedValue for a given value.
+     * @param value The unknown value to check.
+     * @returns A "best guess" TypedValue for the given value.
+     */
+    function toTypedValue(value) {
+        if (value === null || value === undefined) {
+            return { type: 'undefined', value: undefined };
+        }
+        else if (Number.isSafeInteger(value)) {
+            return { type: exports.PropertyType.integer, value };
+        }
+        else if (typeof value === 'number') {
+            return { type: exports.PropertyType.decimal, value };
+        }
+        else if (typeof value === 'boolean') {
+            return { type: exports.PropertyType.boolean, value };
+        }
+        else if (typeof value === 'string') {
+            return { type: exports.PropertyType.string, value };
+        }
+        else if (isQuantity(value)) {
+            return { type: exports.PropertyType.Quantity, value };
+        }
+        else if (typeof value === 'object' && 'resourceType' in value) {
+            return { type: value.resourceType, value };
+        }
+        else {
+            return { type: exports.PropertyType.BackboneElement, value };
+        }
+    }
+    /**
+     * Converts unknown object into a JavaScript boolean.
+     * Note that this is different than the FHIRPath "toBoolean",
+     * which has particular semantics around arrays, empty arrays, and type conversions.
+     * @param obj Any value or array of values.
+     * @returns The converted boolean value according to FHIRPath rules.
+     */
+    function toJsBoolean(obj) {
+        return obj.length === 0 ? false : !!obj[0].value;
+    }
+    /**
+     * Returns the value of the property and the property type.
+     * Some property definitions support multiple types.
+     * For example, "Observation.value[x]" can be "valueString", "valueInteger", "valueQuantity", etc.
+     * According to the spec, there can only be one property for a given element definition.
+     * This function returns the value and the type.
+     * @param input The base context (FHIR resource or backbone element).
+     * @param path The property path.
+     * @returns The value of the property and the property type.
+     */
+    function getTypedPropertyValue(input, path) {
+        if (!input?.value) {
+            return undefined;
+        }
+        const elementDefinition = getElementDefinition(input.type, path);
+        if (elementDefinition) {
+            const typedResult = getTypedPropertyValueWithSchema(input, path, elementDefinition);
+            if (typedResult) {
+                return typedResult;
+            }
+        }
+        return getTypedPropertyValueWithoutSchema(input, path);
+    }
+    /**
+     * Returns the value of the property and the property type using a type schema.
+     * @param input The base context (FHIR resource or backbone element).
+     * @param path The property path.
+     * @param property The property element definition.
+     * @returns The value of the property and the property type.
+     */
+    function getTypedPropertyValueWithSchema(input, path, property) {
+        const types = property.type;
         if (!types || types.length === 0) {
             return undefined;
         }
@@ -8174,7 +8484,7 @@
             return undefined;
         }
         if (resultType === 'Element' || resultType === 'BackboneElement') {
-            resultType = buildTypeName((_a = property.path) === null || _a === void 0 ? void 0 : _a.split('.'));
+            resultType = buildTypeName(property.path?.split('.'));
         }
         if (Array.isArray(resultValue)) {
             return resultValue.map((element) => toTypedValueWithType(element, resultType));
@@ -8385,7 +8695,7 @@
             case 'Quantity':
                 return isQuantity(value);
             default:
-                return typeof value === 'object' && (value === null || value === void 0 ? void 0 : value.resourceType) === desiredType;
+                return typeof value === 'object' && value?.resourceType === desiredType;
         }
     }
     /**
@@ -8774,8 +9084,7 @@
          * @returns A collection containing all but the first item in the input collection.
          */
         skip: (input, num) => {
-            var _a;
-            const numValue = (_a = num.eval(input)[0]) === null || _a === void 0 ? void 0 : _a.value;
+            const numValue = num.eval(input)[0]?.value;
             if (typeof numValue !== 'number') {
                 throw new Error('Expected a number for skip(num)');
             }
@@ -8799,8 +9108,7 @@
          * @returns A collection containing the first num items in the input collection.
          */
         take: (input, num) => {
-            var _a;
-            const numValue = (_a = num.eval(input)[0]) === null || _a === void 0 ? void 0 : _a.value;
+            const numValue = num.eval(input)[0]?.value;
             if (typeof numValue !== 'number') {
                 throw new Error('Expected a number for take(num)');
             }
@@ -9744,7 +10052,6 @@
          * IBM FHIR PR: https://github.com/IBM/FHIR/pull/1023
          */
         between: (input, startAtom, endAtom, unitsAtom) => {
-            var _a;
             const startDate = functions.toDateTime(startAtom.eval(input));
             if (startDate.length === 0) {
                 throw new Error('Invalid start date');
@@ -9753,7 +10060,7 @@
             if (endDate.length === 0) {
                 throw new Error('Invalid end date');
             }
-            const unit = (_a = unitsAtom.eval(input)[0]) === null || _a === void 0 ? void 0 : _a.value;
+            const unit = unitsAtom.eval(input)[0]?.value;
             if (unit !== 'years' && unit !== 'months' && unit !== 'days') {
                 throw new Error('Invalid units');
             }
@@ -9884,13 +10191,10 @@
                 throw new Error('Expected a StructureDefinition URL');
             }
             const expectedResourceType = system.replace('http://hl7.org/fhir/StructureDefinition/', '');
-            return input.map((value) => {
-                var _a;
-                return ({
-                    type: exports.PropertyType.boolean,
-                    value: ((_a = value.value) === null || _a === void 0 ? void 0 : _a.resourceType) === expectedResourceType,
-                });
-            });
+            return input.map((value) => ({
+                type: exports.PropertyType.boolean,
+                value: value.value?.resourceType === expectedResourceType,
+            }));
         },
     };
     /*
@@ -9904,7 +10208,7 @@
         if (typeof value !== 'string') {
             throw new Error('String function cannot be called with non-string');
         }
-        const result = func(value, ...argsAtoms.map((atom) => { var _a, _b; return atom && ((_b = (_a = atom.eval(input)) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.value); }));
+        const result = func(value, ...argsAtoms.map((atom) => atom && atom.eval(input)?.[0]?.value));
         if (result === undefined) {
             return [];
         }
@@ -9923,9 +10227,9 @@
         if (typeof numberInput !== 'number') {
             throw new Error('Math function cannot be called with non-number');
         }
-        const result = func(numberInput, ...argsAtoms.map((atom) => { var _a, _b; return (_b = (_a = atom.eval(input)) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.value; }));
+        const result = func(numberInput, ...argsAtoms.map((atom) => atom.eval(input)?.[0]?.value));
         const type = quantity ? exports.PropertyType.Quantity : input[0].type;
-        const returnValue = quantity ? Object.assign(Object.assign({}, value), { value: result }) : result;
+        const returnValue = quantity ? { ...value, value: result } : result;
         return [{ type, value: returnValue }];
     }
     function validateInput(input, count) {
@@ -9959,6 +10263,9 @@
                 throw new Error(`FhirPathError on "${this.original}": ${error}`);
             }
         }
+        toString() {
+            return this.child.toString();
+        }
     }
     class LiteralAtom {
         constructor(value) {
@@ -9967,6 +10274,13 @@
         eval() {
             return [this.value];
         }
+        toString() {
+            const value = this.value.value;
+            if (typeof value === 'string') {
+                return `'${value}'`;
+            }
+            return value.toString();
+        }
     }
     class SymbolAtom {
         constructor(name) {
@@ -9980,7 +10294,10 @@
             return context
                 .map((e) => __classPrivateFieldGet(this, _SymbolAtom_instances, "m", _SymbolAtom_evalValue).call(this, e))
                 .flat()
-                .filter((e) => (e === null || e === void 0 ? void 0 : e.value) !== undefined);
+                .filter((e) => e?.value !== undefined);
+        }
+        toString() {
+            return this.name;
         }
     }
     _SymbolAtom_instances = new WeakSet(), _SymbolAtom_evalValue = function _SymbolAtom_evalValue(typedValue) {
@@ -9992,587 +10309,280 @@
             return typedValue;
         }
         return getTypedPropertyValue(typedValue, this.name);
-    };
-    class EmptySetAtom {
-        eval() {
-            return [];
-        }
-    }
-    class UnaryOperatorAtom {
-        constructor(child, impl) {
-            this.child = child;
-            this.impl = impl;
-        }
-        eval(context) {
-            return this.impl(this.child.eval(context));
-        }
-    }
-    class AsAtom {
-        constructor(left, right) {
-            this.left = left;
-            this.right = right;
-        }
-        eval(context) {
-            return functions.ofType(this.left.eval(context), this.right);
-        }
-    }
-    class ArithemticOperatorAtom {
-        constructor(left, right, impl) {
-            this.left = left;
-            this.right = right;
-            this.impl = impl;
-        }
-        eval(context) {
-            const leftEvalResult = this.left.eval(context);
-            if (leftEvalResult.length !== 1) {
-                return [];
-            }
-            const rightEvalResult = this.right.eval(context);
-            if (rightEvalResult.length !== 1) {
-                return [];
-            }
-            const leftValue = leftEvalResult[0].value;
-            const rightValue = rightEvalResult[0].value;
-            const leftNumber = isQuantity(leftValue) ? leftValue.value : leftValue;
-            const rightNumber = isQuantity(rightValue) ? rightValue.value : rightValue;
-            const result = this.impl(leftNumber, rightNumber);
-            if (typeof result === 'boolean') {
-                return booleanToTypedValue(result);
-            }
-            else if (isQuantity(leftValue)) {
-                return [{ type: exports.PropertyType.Quantity, value: Object.assign(Object.assign({}, leftValue), { value: result }) }];
-            }
-            else {
-                return [toTypedValue(result)];
-            }
-        }
-    }
-    class ConcatAtom {
-        constructor(left, right) {
-            this.left = left;
-            this.right = right;
-        }
-        eval(context) {
-            const leftValue = this.left.eval(context);
-            const rightValue = this.right.eval(context);
-            const result = [...leftValue, ...rightValue];
-            if (result.length > 0 && result.every((e) => typeof e.value === 'string')) {
-                return [{ type: exports.PropertyType.string, value: result.map((e) => e.value).join('') }];
-            }
-            return result;
-        }
-    }
-    class ContainsAtom {
-        constructor(left, right) {
-            this.left = left;
-            this.right = right;
-        }
-        eval(context) {
-            const leftValue = this.left.eval(context);
-            const rightValue = this.right.eval(context);
-            return booleanToTypedValue(leftValue.some((e) => e.value === rightValue[0].value));
-        }
-    }
-    class InAtom {
-        constructor(left, right) {
-            this.left = left;
-            this.right = right;
-        }
-        eval(context) {
-            const leftValue = this.left.eval(context);
-            const rightValue = this.right.eval(context);
-            return booleanToTypedValue(rightValue.some((e) => e.value === leftValue[0].value));
-        }
-    }
-    class DotAtom {
-        constructor(left, right) {
-            this.left = left;
-            this.right = right;
-        }
-        eval(context) {
-            return this.right.eval(this.left.eval(context));
-        }
-    }
-    class UnionAtom {
-        constructor(left, right) {
-            this.left = left;
-            this.right = right;
-        }
-        eval(context) {
-            const leftResult = this.left.eval(context);
-            const rightResult = this.right.eval(context);
-            return removeDuplicates([...leftResult, ...rightResult]);
-        }
-    }
-    class EqualsAtom {
-        constructor(left, right) {
-            this.left = left;
-            this.right = right;
-        }
-        eval(context) {
-            const leftValue = this.left.eval(context);
-            const rightValue = this.right.eval(context);
-            return fhirPathArrayEquals(leftValue, rightValue);
-        }
-    }
-    class NotEqualsAtom {
-        constructor(left, right) {
-            this.left = left;
-            this.right = right;
+    };
+    class EmptySetAtom {
+        eval() {
+            return [];
         }
-        eval(context) {
-            const leftValue = this.left.eval(context);
-            const rightValue = this.right.eval(context);
-            return fhirPathNot(fhirPathArrayEquals(leftValue, rightValue));
+        toString() {
+            return '{}';
         }
     }
-    class EquivalentAtom {
-        constructor(left, right) {
-            this.left = left;
-            this.right = right;
+    class UnaryOperatorAtom extends PrefixOperatorAtom {
+        constructor(operator, child, impl) {
+            super(operator, child);
+            this.impl = impl;
         }
         eval(context) {
-            const leftValue = this.left.eval(context);
-            const rightValue = this.right.eval(context);
-            return fhirPathArrayEquivalent(leftValue, rightValue);
+            return this.impl(this.child.eval(context));
+        }
+        toString() {
+            return this.child.toString();
         }
     }
-    class NotEquivalentAtom {
+    class AsAtom extends InfixOperatorAtom {
         constructor(left, right) {
-            this.left = left;
-            this.right = right;
+            super('as', left, right);
         }
         eval(context) {
-            const leftValue = this.left.eval(context);
-            const rightValue = this.right.eval(context);
-            return fhirPathNot(fhirPathArrayEquivalent(leftValue, rightValue));
+            return functions.ofType(this.left.eval(context), this.right);
         }
     }
-    class IsAtom {
-        constructor(left, right) {
-            this.left = left;
-            this.right = right;
+    class ArithemticOperatorAtom extends InfixOperatorAtom {
+        constructor(operator, left, right, impl) {
+            super(operator, left, right);
+            this.impl = impl;
         }
         eval(context) {
-            const leftValue = this.left.eval(context);
-            if (leftValue.length !== 1) {
+            const leftEvalResult = this.left.eval(context);
+            if (leftEvalResult.length !== 1) {
                 return [];
             }
-            const typeName = this.right.name;
-            return booleanToTypedValue(fhirPathIs(leftValue[0], typeName));
+            const rightEvalResult = this.right.eval(context);
+            if (rightEvalResult.length !== 1) {
+                return [];
+            }
+            const leftValue = leftEvalResult[0].value;
+            const rightValue = rightEvalResult[0].value;
+            const leftNumber = isQuantity(leftValue) ? leftValue.value : leftValue;
+            const rightNumber = isQuantity(rightValue) ? rightValue.value : rightValue;
+            const result = this.impl(leftNumber, rightNumber);
+            if (typeof result === 'boolean') {
+                return booleanToTypedValue(result);
+            }
+            else if (isQuantity(leftValue)) {
+                return [{ type: exports.PropertyType.Quantity, value: { ...leftValue, value: result } }];
+            }
+            else {
+                return [toTypedValue(result)];
+            }
         }
     }
-    /**
-     * 6.5.1. and
-     * Returns true if both operands evaluate to true,
-     * false if either operand evaluates to false,
-     * and the empty collection otherwise.
-     */
-    class AndAtom {
+    class ConcatAtom extends InfixOperatorAtom {
         constructor(left, right) {
-            this.left = left;
-            this.right = right;
+            super('&', left, right);
         }
         eval(context) {
-            var _a, _b, _c, _d;
             const leftValue = this.left.eval(context);
             const rightValue = this.right.eval(context);
-            if (((_a = leftValue[0]) === null || _a === void 0 ? void 0 : _a.value) === true && ((_b = rightValue[0]) === null || _b === void 0 ? void 0 : _b.value) === true) {
-                return booleanToTypedValue(true);
-            }
-            if (((_c = leftValue[0]) === null || _c === void 0 ? void 0 : _c.value) === false || ((_d = rightValue[0]) === null || _d === void 0 ? void 0 : _d.value) === false) {
-                return booleanToTypedValue(false);
+            const result = [...leftValue, ...rightValue];
+            if (result.length > 0 && result.every((e) => typeof e.value === 'string')) {
+                return [{ type: exports.PropertyType.string, value: result.map((e) => e.value).join('') }];
             }
-            return [];
+            return result;
         }
     }
-    class OrAtom {
+    class ContainsAtom extends InfixOperatorAtom {
         constructor(left, right) {
-            this.left = left;
-            this.right = right;
+            super('contains', left, right);
         }
         eval(context) {
             const leftValue = this.left.eval(context);
-            if (toJsBoolean(leftValue)) {
-                return leftValue;
-            }
             const rightValue = this.right.eval(context);
-            if (toJsBoolean(rightValue)) {
-                return rightValue;
-            }
-            return [];
+            return booleanToTypedValue(leftValue.some((e) => e.value === rightValue[0].value));
         }
     }
-    /**
-     * 6.5.4. xor
-     * Returns true if exactly one of the operands evaluates to true,
-     * false if either both operands evaluate to true or both operands evaluate to false,
-     * and the empty collection otherwise.
-     */
-    class XorAtom {
+    class InAtom extends InfixOperatorAtom {
         constructor(left, right) {
-            this.left = left;
-            this.right = right;
-        }
-        eval(context) {
-            const leftResult = this.left.eval(context);
-            const rightResult = this.right.eval(context);
-            if (leftResult.length === 0 && rightResult.length === 0) {
-                return [];
-            }
-            const leftValue = leftResult.length === 0 ? null : leftResult[0].value;
-            const rightValue = rightResult.length === 0 ? null : rightResult[0].value;
-            if ((leftValue === true && rightValue !== true) || (leftValue !== true && rightValue === true)) {
-                return booleanToTypedValue(true);
-            }
-            if ((leftValue === true && rightValue === true) || (leftValue === false && rightValue === false)) {
-                return booleanToTypedValue(false);
-            }
-            return [];
-        }
-    }
-    class FunctionAtom {
-        constructor(name, args, impl) {
-            this.name = name;
-            this.args = args;
-            this.impl = impl;
+            super('in', left, right);
         }
         eval(context) {
-            return this.impl(context, ...this.args);
+            const leftValue = this.left.eval(context);
+            const rightValue = this.right.eval(context);
+            return booleanToTypedValue(rightValue.some((e) => e.value === leftValue[0].value));
         }
     }
-    class IndexerAtom {
-        constructor(left, expr) {
-            this.left = left;
-            this.expr = expr;
+    class DotAtom extends InfixOperatorAtom {
+        constructor(left, right) {
+            super('.', left, right);
         }
         eval(context) {
-            const evalResult = this.expr.eval(context);
-            if (evalResult.length !== 1) {
-                return [];
-            }
-            const index = evalResult[0].value;
-            if (typeof index !== 'number') {
-                throw new Error(`Invalid indexer expression: should return integer}`);
-            }
-            const leftResult = this.left.eval(context);
-            if (!(index in leftResult)) {
-                return [];
-            }
-            return [leftResult[index]];
-        }
-    }
-
-    var _ParserBuilder_prefixParselets, _ParserBuilder_infixParselets, _Parser_tokens, _Parser_prefixParselets, _Parser_infixParselets;
-    class ParserBuilder {
-        constructor() {
-            _ParserBuilder_prefixParselets.set(this, {});
-            _ParserBuilder_infixParselets.set(this, {});
-        }
-        registerInfix(tokenType, parselet) {
-            __classPrivateFieldGet(this, _ParserBuilder_infixParselets, "f")[tokenType] = parselet;
-            return this;
-        }
-        registerPrefix(tokenType, parselet) {
-            __classPrivateFieldGet(this, _ParserBuilder_prefixParselets, "f")[tokenType] = parselet;
-            return this;
-        }
-        prefix(tokenType, precedence, builder) {
-            return this.registerPrefix(tokenType, {
-                parse(parser, token) {
-                    const right = parser.consumeAndParse(precedence);
-                    return builder(token, right);
-                },
-            });
-        }
-        infixLeft(tokenType, precedence, builder) {
-            return this.registerInfix(tokenType, {
-                parse(parser, left, token) {
-                    const right = parser.consumeAndParse(precedence);
-                    return builder(left, token, right);
-                },
-                precedence,
-            });
-        }
-        construct(input) {
-            return new Parser(input, __classPrivateFieldGet(this, _ParserBuilder_prefixParselets, "f"), __classPrivateFieldGet(this, _ParserBuilder_infixParselets, "f"));
-        }
-    }
-    _ParserBuilder_prefixParselets = new WeakMap(), _ParserBuilder_infixParselets = new WeakMap();
-    class Parser {
-        constructor(tokens, prefixParselets, infixParselets) {
-            _Parser_tokens.set(this, void 0);
-            _Parser_prefixParselets.set(this, void 0);
-            _Parser_infixParselets.set(this, void 0);
-            __classPrivateFieldSet(this, _Parser_tokens, tokens, "f");
-            __classPrivateFieldSet(this, _Parser_prefixParselets, prefixParselets, "f");
-            __classPrivateFieldSet(this, _Parser_infixParselets, infixParselets, "f");
-        }
-        hasMore() {
-            return __classPrivateFieldGet(this, _Parser_tokens, "f").length > 0;
-        }
-        match(expected) {
-            const token = this.peek();
-            if ((token === null || token === void 0 ? void 0 : token.id) !== expected) {
-                return false;
-            }
-            this.consume();
-            return true;
-        }
-        consumeAndParse(precedence = Infinity) {
-            const token = this.consume();
-            const prefix = __classPrivateFieldGet(this, _Parser_prefixParselets, "f")[token.id];
-            if (!prefix) {
-                throw Error(`Parse error at "${token.value}" (line ${token.line}, column ${token.column}). No matching prefix parselet.`);
-            }
-            let left = prefix.parse(this, token);
-            while (precedence > this.getPrecedence()) {
-                const next = this.consume();
-                const infix = __classPrivateFieldGet(this, _Parser_infixParselets, "f")[next.id];
-                left = infix.parse(this, left, next);
-            }
-            return left;
-        }
-        getPrecedence() {
-            const nextToken = this.peek();
-            if (!nextToken) {
-                return Infinity;
-            }
-            const parser = __classPrivateFieldGet(this, _Parser_infixParselets, "f")[nextToken.id];
-            if (parser) {
-                return parser.precedence;
-            }
-            return Infinity;
-        }
-        consume(expected) {
-            var _a;
-            if (!__classPrivateFieldGet(this, _Parser_tokens, "f").length) {
-                throw Error('Cant consume unknown more tokens.');
-            }
-            if (expected && ((_a = this.peek()) === null || _a === void 0 ? void 0 : _a.id) !== expected) {
-                const actual = this.peek();
-                throw Error(`Expected ${expected} but got "${actual.value}" at line ${actual.line} column ${actual.column}.`);
-            }
-            return __classPrivateFieldGet(this, _Parser_tokens, "f").shift();
-        }
-        peek() {
-            return __classPrivateFieldGet(this, _Parser_tokens, "f").length > 0 ? __classPrivateFieldGet(this, _Parser_tokens, "f")[0] : undefined;
-        }
-        removeComments() {
-            __classPrivateFieldSet(this, _Parser_tokens, __classPrivateFieldGet(this, _Parser_tokens, "f").filter((t) => t.id !== 'Comment'), "f");
-        }
-    }
-    _Parser_tokens = new WeakMap(), _Parser_prefixParselets = new WeakMap(), _Parser_infixParselets = new WeakMap();
-
-    var _Tokenizer_instances, _Tokenizer_str, _Tokenizer_keywords, _Tokenizer_operators, _Tokenizer_result, _Tokenizer_pos, _Tokenizer_markStack, _Tokenizer_prevToken, _Tokenizer_peekToken, _Tokenizer_consumeToken, _Tokenizer_consumeWhitespace, _Tokenizer_consumeMultiLineComment, _Tokenizer_consumeSingleLineComment, _Tokenizer_consumeString, _Tokenizer_consumeBacktickSymbol, _Tokenizer_consumeDateTime, _Tokenizer_consumeNumber, _Tokenizer_consumeSymbol, _Tokenizer_consumeOperator, _Tokenizer_consumeWhile, _Tokenizer_curr, _Tokenizer_prev, _Tokenizer_peek, _Tokenizer_mark, _Tokenizer_reset, _Tokenizer_advance, _Tokenizer_buildToken;
-    const STANDARD_UNITS = [
-        'year',
-        'years',
-        'month',
-        'months',
-        'week',
-        'weeks',
-        'day',
-        'days',
-        'hour',
-        'hours',
-        'minute',
-        'minutes',
-        'second',
-        'seconds',
-        'millisecond',
-        'milliseconds',
-    ];
-    class Tokenizer {
-        constructor(str, keywords, operators) {
-            _Tokenizer_instances.add(this);
-            _Tokenizer_str.set(this, void 0);
-            _Tokenizer_keywords.set(this, void 0);
-            _Tokenizer_operators.set(this, void 0);
-            _Tokenizer_result.set(this, []);
-            _Tokenizer_pos.set(this, { index: 0, line: 0, column: 0 });
-            _Tokenizer_markStack.set(this, []);
-            __classPrivateFieldSet(this, _Tokenizer_str, str, "f");
-            __classPrivateFieldSet(this, _Tokenizer_keywords, keywords, "f");
-            __classPrivateFieldSet(this, _Tokenizer_operators, operators, "f");
+            return this.right.eval(this.left.eval(context));
         }
-        tokenize() {
-            while (__classPrivateFieldGet(this, _Tokenizer_pos, "f").index < __classPrivateFieldGet(this, _Tokenizer_str, "f").length) {
-                const token = __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeToken).call(this);
-                if (token) {
-                    __classPrivateFieldGet(this, _Tokenizer_result, "f").push(token);
-                }
-            }
-            return __classPrivateFieldGet(this, _Tokenizer_result, "f");
+        toString() {
+            return `${this.left.toString()}.${this.right.toString()}`;
         }
     }
-    _Tokenizer_str = new WeakMap(), _Tokenizer_keywords = new WeakMap(), _Tokenizer_operators = new WeakMap(), _Tokenizer_result = new WeakMap(), _Tokenizer_pos = new WeakMap(), _Tokenizer_markStack = new WeakMap(), _Tokenizer_instances = new WeakSet(), _Tokenizer_prevToken = function _Tokenizer_prevToken() {
-        return __classPrivateFieldGet(this, _Tokenizer_result, "f").slice(-1)[0];
-    }, _Tokenizer_peekToken = function _Tokenizer_peekToken() {
-        __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_mark).call(this);
-        const token = __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeToken).call(this);
-        __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_reset).call(this);
-        return token;
-    }, _Tokenizer_consumeToken = function _Tokenizer_consumeToken() {
-        __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeWhitespace).call(this);
-        const c = __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this);
-        if (!c) {
-            return undefined;
+    class UnionAtom extends InfixOperatorAtom {
+        constructor(left, right) {
+            super('|', left, right);
         }
-        __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_mark).call(this);
-        const next = __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_peek).call(this);
-        if (c === '/' && next === '*') {
-            return __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeMultiLineComment).call(this);
+        eval(context) {
+            const leftResult = this.left.eval(context);
+            const rightResult = this.right.eval(context);
+            return removeDuplicates([...leftResult, ...rightResult]);
         }
-        if (c === '/' && next === '/') {
-            return __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeSingleLineComment).call(this);
+    }
+    class EqualsAtom extends InfixOperatorAtom {
+        constructor(left, right) {
+            super('=', left, right);
         }
-        if (c === "'" || c === '"') {
-            return __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeString).call(this, c);
+        eval(context) {
+            const leftValue = this.left.eval(context);
+            const rightValue = this.right.eval(context);
+            return fhirPathArrayEquals(leftValue, rightValue);
         }
-        if (c === '`') {
-            return __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeBacktickSymbol).call(this);
+    }
+    class NotEqualsAtom extends InfixOperatorAtom {
+        constructor(left, right) {
+            super('!=', left, right);
         }
-        if (c === '@') {
-            return __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeDateTime).call(this);
+        eval(context) {
+            const leftValue = this.left.eval(context);
+            const rightValue = this.right.eval(context);
+            return fhirPathNot(fhirPathArrayEquals(leftValue, rightValue));
         }
-        if (c.match(/\d/)) {
-            return __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeNumber).call(this);
+    }
+    class EquivalentAtom extends InfixOperatorAtom {
+        constructor(left, right) {
+            super('~', left, right);
         }
-        if (c.match(/\w/)) {
-            return __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeSymbol).call(this);
+        eval(context) {
+            const leftValue = this.left.eval(context);
+            const rightValue = this.right.eval(context);
+            return fhirPathArrayEquivalent(leftValue, rightValue);
         }
-        if (c === '$' && next.match(/\w/)) {
-            return __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeSymbol).call(this);
+    }
+    class NotEquivalentAtom extends InfixOperatorAtom {
+        constructor(left, right) {
+            super('!~', left, right);
         }
-        return __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeOperator).call(this);
-    }, _Tokenizer_consumeWhitespace = function _Tokenizer_consumeWhitespace() {
-        __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeWhile).call(this, () => __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this).match(/\s/));
-    }, _Tokenizer_consumeMultiLineComment = function _Tokenizer_consumeMultiLineComment() {
-        const start = __classPrivateFieldGet(this, _Tokenizer_pos, "f").index;
-        __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeWhile).call(this, () => __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this) !== '*' || __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_peek).call(this) !== '/');
-        __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_advance).call(this);
-        __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_advance).call(this);
-        return __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_buildToken).call(this, 'Comment', __classPrivateFieldGet(this, _Tokenizer_str, "f").substring(start, __classPrivateFieldGet(this, _Tokenizer_pos, "f").index));
-    }, _Tokenizer_consumeSingleLineComment = function _Tokenizer_consumeSingleLineComment() {
-        return __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_buildToken).call(this, 'Comment', __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeWhile).call(this, () => __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this) !== '\n'));
-    }, _Tokenizer_consumeString = function _Tokenizer_consumeString(endChar) {
-        __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_advance).call(this);
-        const result = __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_buildToken).call(this, 'String', __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeWhile).call(this, () => __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_prev).call(this) === '\\' || __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this) !== endChar));
-        __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_advance).call(this);
-        return result;
-    }, _Tokenizer_consumeBacktickSymbol = function _Tokenizer_consumeBacktickSymbol() {
-        __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_advance).call(this);
-        const result = __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_buildToken).call(this, 'Symbol', __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeWhile).call(this, () => __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this) !== '`'));
-        __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_advance).call(this);
-        return result;
-    }, _Tokenizer_consumeDateTime = function _Tokenizer_consumeDateTime() {
-        __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_advance).call(this); // Consume "@"
-        const start = __classPrivateFieldGet(this, _Tokenizer_pos, "f").index;
-        __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeWhile).call(this, () => __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this).match(/[\d-]/));
-        if (__classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this) === 'T') {
-            __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_advance).call(this);
-            __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeWhile).call(this, () => __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this).match(/[\d:]/));
-            if (__classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this) === '.' && __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_peek).call(this).match(/\d/)) {
-                __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_advance).call(this);
-                __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeWhile).call(this, () => __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this).match(/\d/));
+        eval(context) {
+            const leftValue = this.left.eval(context);
+            const rightValue = this.right.eval(context);
+            return fhirPathNot(fhirPathArrayEquivalent(leftValue, rightValue));
+        }
+    }
+    class IsAtom extends InfixOperatorAtom {
+        constructor(left, right) {
+            super('is', left, right);
+        }
+        eval(context) {
+            const leftValue = this.left.eval(context);
+            if (leftValue.length !== 1) {
+                return [];
             }
-            if (__classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this) === 'Z') {
-                __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_advance).call(this);
+            const typeName = this.right.name;
+            return booleanToTypedValue(fhirPathIs(leftValue[0], typeName));
+        }
+    }
+    /**
+     * 6.5.1. and
+     * Returns true if both operands evaluate to true,
+     * false if either operand evaluates to false,
+     * and the empty collection otherwise.
+     */
+    class AndAtom extends InfixOperatorAtom {
+        constructor(left, right) {
+            super('and', left, right);
+        }
+        eval(context) {
+            const leftValue = this.left.eval(context);
+            const rightValue = this.right.eval(context);
+            if (leftValue[0]?.value === true && rightValue[0]?.value === true) {
+                return booleanToTypedValue(true);
             }
-            else if (__classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this) === '+' || __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this) === '-') {
-                __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_advance).call(this);
-                __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeWhile).call(this, () => __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this).match(/[\d:]/));
+            if (leftValue[0]?.value === false || rightValue[0]?.value === false) {
+                return booleanToTypedValue(false);
             }
+            return [];
         }
-        return __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_buildToken).call(this, 'DateTime', __classPrivateFieldGet(this, _Tokenizer_str, "f").substring(start, __classPrivateFieldGet(this, _Tokenizer_pos, "f").index));
-    }, _Tokenizer_consumeNumber = function _Tokenizer_consumeNumber() {
-        const start = __classPrivateFieldGet(this, _Tokenizer_pos, "f").index;
-        let id = 'Number';
-        __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeWhile).call(this, () => __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this).match(/\d/));
-        if (__classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this) === '.' && __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_peek).call(this).match(/\d/)) {
-            __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_advance).call(this);
-            __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeWhile).call(this, () => __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this).match(/\d/));
+    }
+    class OrAtom extends InfixOperatorAtom {
+        constructor(left, right) {
+            super('or', left, right);
         }
-        if (__classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this) === ' ') {
-            if (isUnitToken(__classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_peekToken).call(this))) {
-                id = 'Quantity';
-                __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeToken).call(this);
+        eval(context) {
+            const leftValue = this.left.eval(context);
+            if (toJsBoolean(leftValue)) {
+                return leftValue;
             }
+            const rightValue = this.right.eval(context);
+            if (toJsBoolean(rightValue)) {
+                return rightValue;
+            }
+            return [];
         }
-        return __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_buildToken).call(this, id, __classPrivateFieldGet(this, _Tokenizer_str, "f").substring(start, __classPrivateFieldGet(this, _Tokenizer_pos, "f").index));
-    }, _Tokenizer_consumeSymbol = function _Tokenizer_consumeSymbol() {
-        var _a;
-        const value = __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeWhile).call(this, () => __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this).match(/[$\w]/));
-        if (((_a = __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_prevToken).call(this)) === null || _a === void 0 ? void 0 : _a.value) !== '.' && __classPrivateFieldGet(this, _Tokenizer_keywords, "f").includes(value)) {
-            return __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_buildToken).call(this, value, value);
-        }
-        return __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_buildToken).call(this, 'Symbol', value);
-    }, _Tokenizer_consumeOperator = function _Tokenizer_consumeOperator() {
-        const c = __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this);
-        const next = __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_peek).call(this);
-        const twoCharOp = c + next;
-        if (__classPrivateFieldGet(this, _Tokenizer_operators, "f").includes(twoCharOp)) {
-            __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_advance).call(this);
-            __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_advance).call(this);
-            return __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_buildToken).call(this, twoCharOp, twoCharOp);
+    }
+    /**
+     * 6.5.4. xor
+     * Returns true if exactly one of the operands evaluates to true,
+     * false if either both operands evaluate to true or both operands evaluate to false,
+     * and the empty collection otherwise.
+     */
+    class XorAtom extends InfixOperatorAtom {
+        constructor(left, right) {
+            super('xor', left, right);
         }
-        __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_advance).call(this);
-        return __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_buildToken).call(this, c, c);
-    }, _Tokenizer_consumeWhile = function _Tokenizer_consumeWhile(condition) {
-        const start = __classPrivateFieldGet(this, _Tokenizer_pos, "f").index;
-        while (__classPrivateFieldGet(this, _Tokenizer_pos, "f").index < __classPrivateFieldGet(this, _Tokenizer_str, "f").length && condition()) {
-            __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_advance).call(this);
+        eval(context) {
+            const leftResult = this.left.eval(context);
+            const rightResult = this.right.eval(context);
+            if (leftResult.length === 0 && rightResult.length === 0) {
+                return [];
+            }
+            const leftValue = leftResult.length === 0 ? null : leftResult[0].value;
+            const rightValue = rightResult.length === 0 ? null : rightResult[0].value;
+            if ((leftValue === true && rightValue !== true) || (leftValue !== true && rightValue === true)) {
+                return booleanToTypedValue(true);
+            }
+            if ((leftValue === true && rightValue === true) || (leftValue === false && rightValue === false)) {
+                return booleanToTypedValue(false);
+            }
+            return [];
         }
-        return __classPrivateFieldGet(this, _Tokenizer_str, "f").substring(start, __classPrivateFieldGet(this, _Tokenizer_pos, "f").index);
-    }, _Tokenizer_curr = function _Tokenizer_curr() {
-        return __classPrivateFieldGet(this, _Tokenizer_str, "f")[__classPrivateFieldGet(this, _Tokenizer_pos, "f").index];
-    }, _Tokenizer_prev = function _Tokenizer_prev() {
-        var _a;
-        return (_a = __classPrivateFieldGet(this, _Tokenizer_str, "f")[__classPrivateFieldGet(this, _Tokenizer_pos, "f").index - 1]) !== null && _a !== void 0 ? _a : '';
-    }, _Tokenizer_peek = function _Tokenizer_peek() {
-        var _a;
-        return (_a = __classPrivateFieldGet(this, _Tokenizer_str, "f")[__classPrivateFieldGet(this, _Tokenizer_pos, "f").index + 1]) !== null && _a !== void 0 ? _a : '';
-    }, _Tokenizer_mark = function _Tokenizer_mark() {
-        __classPrivateFieldGet(this, _Tokenizer_markStack, "f").push(Object.assign({}, __classPrivateFieldGet(this, _Tokenizer_pos, "f")));
-    }, _Tokenizer_reset = function _Tokenizer_reset() {
-        const mark = __classPrivateFieldGet(this, _Tokenizer_markStack, "f").pop();
-        if (!mark) {
-            throw new Error('No mark to reset to');
+    }
+    class FunctionAtom {
+        constructor(name, args) {
+            this.name = name;
+            this.args = args;
         }
-        __classPrivateFieldGet(this, _Tokenizer_pos, "f").index = mark.index;
-        __classPrivateFieldGet(this, _Tokenizer_pos, "f").line = mark.line;
-        __classPrivateFieldGet(this, _Tokenizer_pos, "f").column = mark.column;
-    }, _Tokenizer_advance = function _Tokenizer_advance() {
-        __classPrivateFieldGet(this, _Tokenizer_pos, "f").index++;
-        if (__classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this) === '\n') {
-            __classPrivateFieldGet(this, _Tokenizer_pos, "f").line++;
-            __classPrivateFieldGet(this, _Tokenizer_pos, "f").column = 0;
+        eval(context) {
+            const impl = functions[this.name];
+            if (!impl) {
+                throw new Error('Unrecognized function: ' + this.name);
+            }
+            return impl(context, ...this.args);
         }
-        else {
-            __classPrivateFieldGet(this, _Tokenizer_pos, "f").column++;
+        toString() {
+            return `${this.name}(${this.args.map((arg) => arg.toString()).join(', ')})`;
         }
-    }, _Tokenizer_buildToken = function _Tokenizer_buildToken(id, value) {
-        const mark = __classPrivateFieldGet(this, _Tokenizer_markStack, "f").pop();
-        if (!mark) {
-            throw new Error('No mark for token');
+    }
+    class IndexerAtom {
+        constructor(left, expr) {
+            this.left = left;
+            this.expr = expr;
         }
-        return Object.assign({ id,
-            value }, mark);
-    };
-    function isUnitToken(token) {
-        if (token) {
-            if (token.id === 'String') {
-                return true;
+        eval(context) {
+            const evalResult = this.expr.eval(context);
+            if (evalResult.length !== 1) {
+                return [];
             }
-            if (token.id === 'Symbol' && STANDARD_UNITS.includes(token.value)) {
-                return true;
+            const index = evalResult[0].value;
+            if (typeof index !== 'number') {
+                throw new Error(`Invalid indexer expression: should return integer}`);
+            }
+            const leftResult = this.left.eval(context);
+            if (!(index in leftResult)) {
+                return [];
             }
+            return [leftResult[index]];
+        }
+        toString() {
+            return `${this.left.toString()}[${this.expr.toString()}]`;
         }
-        return false;
     }
 
-    const FHIRPATH_KEYWORDS = ['true', 'false', 'and', 'as', 'contains', 'div', 'in', 'is', 'mod', 'or', 'xor'];
+    const FHIRPATH_KEYWORDS = ['true', 'false'];
     const FHIRPATH_OPERATORS = ['!=', '!~', '<=', '>=', '{}', '->'];
     function tokenize(str) {
         return new Tokenizer(str, FHIRPATH_KEYWORDS, FHIRPATH_OPERATORS).tokenize();
@@ -10582,7 +10592,7 @@
         parse(parser) {
             const expr = parser.consumeAndParse();
             if (!parser.match(')')) {
-                throw new Error('Parse error: expected `)`');
+                throw new Error('Parse error: expected `)` got `' + parser.peek()?.value + '`');
             }
             return expr;
         },
@@ -10595,24 +10605,21 @@
             }
             return new IndexerAtom(left, expr);
         },
-        precedence: 2 /* Precedence.Indexer */,
+        precedence: 2 /* OperatorPrecedence.Indexer */,
     };
     const FUNCTION_CALL_PARSELET = {
         parse(parser, left) {
             if (!(left instanceof SymbolAtom)) {
                 throw new Error('Unexpected parentheses');
             }
-            if (!(left.name in functions)) {
-                throw new Error('Unrecognized function: ' + left.name);
-            }
             const args = [];
             while (!parser.match(')')) {
                 args.push(parser.consumeAndParse());
                 parser.match(',');
             }
-            return new FunctionAtom(left.name, args, functions[left.name]);
+            return new FunctionAtom(left.name, args); //, functions[left.name]);
         },
-        precedence: 0 /* Precedence.FunctionCall */,
+        precedence: 0 /* OperatorPrecedence.FunctionCall */,
     };
     function parseQuantity(str) {
         const parts = str.split(' ');
@@ -10647,32 +10654,32 @@
             .registerPrefix('(', PARENTHESES_PARSELET)
             .registerInfix('[', INDEXER_PARSELET)
             .registerInfix('(', FUNCTION_CALL_PARSELET)
-            .prefix('+', 3 /* Precedence.UnaryAdd */, (_, right) => new UnaryOperatorAtom(right, (x) => x))
-            .prefix('-', 3 /* Precedence.UnarySubtract */, (_, right) => new ArithemticOperatorAtom(right, right, (_, y) => -y))
-            .infixLeft('.', 1 /* Precedence.Dot */, (left, _, right) => new DotAtom(left, right))
-            .infixLeft('/', 4 /* Precedence.Divide */, (left, _, right) => new ArithemticOperatorAtom(left, right, (x, y) => x / y))
-            .infixLeft('*', 4 /* Precedence.Multiply */, (left, _, right) => new ArithemticOperatorAtom(left, right, (x, y) => x * y))
-            .infixLeft('+', 5 /* Precedence.Add */, (left, _, right) => new ArithemticOperatorAtom(left, right, (x, y) => x + y))
-            .infixLeft('-', 5 /* Precedence.Subtract */, (left, _, right) => new ArithemticOperatorAtom(left, right, (x, y) => x - y))
-            .infixLeft('|', 7 /* Precedence.Union */, (left, _, right) => new UnionAtom(left, right))
-            .infixLeft('=', 9 /* Precedence.Equals */, (left, _, right) => new EqualsAtom(left, right))
-            .infixLeft('!=', 9 /* Precedence.Equals */, (left, _, right) => new NotEqualsAtom(left, right))
-            .infixLeft('~', 9 /* Precedence.Equivalent */, (left, _, right) => new EquivalentAtom(left, right))
-            .infixLeft('!~', 9 /* Precedence.NotEquivalent */, (left, _, right) => new NotEquivalentAtom(left, right))
-            .infixLeft('<', 8 /* Precedence.LessThan */, (left, _, right) => new ArithemticOperatorAtom(left, right, (x, y) => x < y))
-            .infixLeft('<=', 8 /* Precedence.LessThanOrEquals */, (left, _, right) => new ArithemticOperatorAtom(left, right, (x, y) => x <= y))
-            .infixLeft('>', 8 /* Precedence.GreaterThan */, (left, _, right) => new ArithemticOperatorAtom(left, right, (x, y) => x > y))
-            .infixLeft('>=', 8 /* Precedence.GreaterThanOrEquals */, (left, _, right) => new ArithemticOperatorAtom(left, right, (x, y) => x >= y))
-            .infixLeft('&', 5 /* Precedence.Ampersand */, (left, _, right) => new ConcatAtom(left, right))
-            .infixLeft('and', 6 /* Precedence.Is */, (left, _, right) => new AndAtom(left, right))
-            .infixLeft('as', 6 /* Precedence.Is */, (left, _, right) => new AsAtom(left, right))
-            .infixLeft('contains', 6 /* Precedence.Is */, (left, _, right) => new ContainsAtom(left, right))
-            .infixLeft('div', 6 /* Precedence.Is */, (left, _, right) => new ArithemticOperatorAtom(left, right, (x, y) => (x / y) | 0))
-            .infixLeft('in', 6 /* Precedence.Is */, (left, _, right) => new InAtom(left, right))
-            .infixLeft('is', 6 /* Precedence.Is */, (left, _, right) => new IsAtom(left, right))
-            .infixLeft('mod', 6 /* Precedence.Is */, (left, _, right) => new ArithemticOperatorAtom(left, right, (x, y) => x % y))
-            .infixLeft('or', 6 /* Precedence.Is */, (left, _, right) => new OrAtom(left, right))
-            .infixLeft('xor', 6 /* Precedence.Is */, (left, _, right) => new XorAtom(left, right));
+            .prefix('+', 3 /* OperatorPrecedence.UnaryAdd */, (_, right) => new UnaryOperatorAtom('+', right, (x) => x))
+            .prefix('-', 3 /* OperatorPrecedence.UnarySubtract */, (_, right) => new ArithemticOperatorAtom('-', right, right, (_, y) => -y))
+            .infixLeft('.', 1 /* OperatorPrecedence.Dot */, (left, _, right) => new DotAtom(left, right))
+            .infixLeft('/', 4 /* OperatorPrecedence.Divide */, (left, _, right) => new ArithemticOperatorAtom('/', left, right, (x, y) => x / y))
+            .infixLeft('*', 4 /* OperatorPrecedence.Multiply */, (left, _, right) => new ArithemticOperatorAtom('*', left, right, (x, y) => x * y))
+            .infixLeft('+', 5 /* OperatorPrecedence.Add */, (left, _, right) => new ArithemticOperatorAtom('+', left, right, (x, y) => x + y))
+            .infixLeft('-', 5 /* OperatorPrecedence.Subtract */, (left, _, right) => new ArithemticOperatorAtom('-', left, right, (x, y) => x - y))
+            .infixLeft('|', 7 /* OperatorPrecedence.Union */, (left, _, right) => new UnionAtom(left, right))
+            .infixLeft('=', 9 /* OperatorPrecedence.Equals */, (left, _, right) => new EqualsAtom(left, right))
+            .infixLeft('!=', 9 /* OperatorPrecedence.Equals */, (left, _, right) => new NotEqualsAtom(left, right))
+            .infixLeft('~', 9 /* OperatorPrecedence.Equivalent */, (left, _, right) => new EquivalentAtom(left, right))
+            .infixLeft('!~', 9 /* OperatorPrecedence.NotEquivalent */, (left, _, right) => new NotEquivalentAtom(left, right))
+            .infixLeft('<', 8 /* OperatorPrecedence.LessThan */, (left, _, right) => new ArithemticOperatorAtom('<', left, right, (x, y) => x < y))
+            .infixLeft('<=', 8 /* OperatorPrecedence.LessThanOrEquals */, (left, _, right) => new ArithemticOperatorAtom('<=', left, right, (x, y) => x <= y))
+            .infixLeft('>', 8 /* OperatorPrecedence.GreaterThan */, (left, _, right) => new ArithemticOperatorAtom('>', left, right, (x, y) => x > y))
+            .infixLeft('>=', 8 /* OperatorPrecedence.GreaterThanOrEquals */, (left, _, right) => new ArithemticOperatorAtom('>=', left, right, (x, y) => x >= y))
+            .infixLeft('&', 5 /* OperatorPrecedence.Ampersand */, (left, _, right) => new ConcatAtom(left, right))
+            .infixLeft('and', 6 /* OperatorPrecedence.Is */, (left, _, right) => new AndAtom(left, right))
+            .infixLeft('as', 6 /* OperatorPrecedence.Is */, (left, _, right) => new AsAtom(left, right))
+            .infixLeft('contains', 6 /* OperatorPrecedence.Is */, (left, _, right) => new ContainsAtom(left, right))
+            .infixLeft('div', 6 /* OperatorPrecedence.Is */, (left, _, right) => new ArithemticOperatorAtom('div', left, right, (x, y) => (x / y) | 0))
+            .infixLeft('in', 6 /* OperatorPrecedence.Is */, (left, _, right) => new InAtom(left, right))
+            .infixLeft('is', 6 /* OperatorPrecedence.Is */, (left, _, right) => new IsAtom(left, right))
+            .infixLeft('mod', 6 /* OperatorPrecedence.Is */, (left, _, right) => new ArithemticOperatorAtom('mod', left, right, (x, y) => x % y))
+            .infixLeft('or', 6 /* OperatorPrecedence.Is */, (left, _, right) => new OrAtom(left, right))
+            .infixLeft('xor', 6 /* OperatorPrecedence.Is */, (left, _, right) => new XorAtom(left, right));
     }
     const fhirPathParserBuilder = initFhirPathParserBuilder();
     /**
@@ -10792,15 +10799,14 @@
          * @returns The HL7 "ACK" message.
          */
         buildAck() {
-            var _a, _b, _c, _d, _e, _f;
             const now = new Date();
             const msh = this.get('MSH');
-            const sendingApp = ((_a = msh === null || msh === void 0 ? void 0 : msh.get(2)) === null || _a === void 0 ? void 0 : _a.toString()) || '';
-            const sendingFacility = ((_b = msh === null || msh === void 0 ? void 0 : msh.get(3)) === null || _b === void 0 ? void 0 : _b.toString()) || '';
-            const receivingApp = ((_c = msh === null || msh === void 0 ? void 0 : msh.get(4)) === null || _c === void 0 ? void 0 : _c.toString()) || '';
-            const receivingFacility = ((_d = msh === null || msh === void 0 ? void 0 : msh.get(5)) === null || _d === void 0 ? void 0 : _d.toString()) || '';
-            const controlId = ((_e = msh === null || msh === void 0 ? void 0 : msh.get(9)) === null || _e === void 0 ? void 0 : _e.toString()) || '';
-            const versionId = ((_f = msh === null || msh === void 0 ? void 0 : msh.get(12)) === null || _f === void 0 ? void 0 : _f.toString()) || '2.5.1';
+            const sendingApp = msh?.get(2)?.toString() || '';
+            const sendingFacility = msh?.get(3)?.toString() || '';
+            const receivingApp = msh?.get(4)?.toString() || '';
+            const receivingFacility = msh?.get(5)?.toString() || '';
+            const controlId = msh?.get(9)?.toString() || '';
+            const versionId = msh?.get(12)?.toString() || '2.5.1';
             return new Hl7Message([
                 new Hl7Segment([
                     'MSH',
@@ -11162,8 +11168,7 @@
      * @returns The search parameter type details.
      */
     function getSearchParameterDetails(resourceType, searchParam) {
-        var _a, _b;
-        let result = (_b = (_a = globalSchema.types[resourceType]) === null || _a === void 0 ? void 0 : _a.searchParamsDetails) === null || _b === void 0 ? void 0 : _b[searchParam.code];
+        let result = globalSchema.types[resourceType]?.searchParamsDetails?.[searchParam.code];
         if (!result) {
             result = buildSearchParamterDetails(resourceType, searchParam);
         }
@@ -11177,13 +11182,12 @@
         typeSchema.searchParamsDetails[code] = details;
     }
     function buildSearchParamterDetails(resourceType, searchParam) {
-        var _a, _b, _c, _d, _e, _f, _g;
         if (searchParam.code === '_lastUpdated') {
             return { columnName: 'lastUpdated', type: exports.SearchParameterType.DATETIME };
         }
         const code = searchParam.code;
         const columnName = convertCodeToColumnName(code);
-        const expression = (_a = getExpressionForResourceType(resourceType, searchParam.expression)) === null || _a === void 0 ? void 0 : _a.split('.');
+        const expression = getExpressionForResourceType(resourceType, searchParam.expression)?.split('.');
         if (!expression) {
             // This happens on compound types
             // In the future, explore returning multiple column definitions
@@ -11197,14 +11201,15 @@
         for (let i = 1; i < expression.length; i++) {
             const propertyName = expression[i];
             elementDefinition =
-                (_d = (_c = (_b = globalSchema.types[baseType]) === null || _b === void 0 ? void 0 : _b.properties) === null || _c === void 0 ? void 0 : _c[propertyName]) !== null && _d !== void 0 ? _d : (_f = (_e = globalSchema.types[baseType]) === null || _e === void 0 ? void 0 : _e.properties) === null || _f === void 0 ? void 0 : _f[propertyName + '[x]'];
+                globalSchema.types[baseType]?.properties?.[propertyName] ??
+                    globalSchema.types[baseType]?.properties?.[propertyName + '[x]'];
             if (!elementDefinition) {
                 throw new Error(`Element definition not found for ${resourceType} ${searchParam.code}`);
             }
             if (elementDefinition.max === '*') {
                 array = true;
             }
-            propertyType = (_g = elementDefinition.type) === null || _g === void 0 ? void 0 : _g[0].code;
+            propertyType = elementDefinition.type?.[0].code;
             if (!propertyType) {
                 // This happens when one of parent properties uses contentReference
                 // In the future, explore following the reference
@@ -11319,9 +11324,8 @@
      * @returns True if the resource satisfies the search filter.
      */
     function matchesSearchFilter(resource, searchRequest, filter) {
-        var _a, _b;
-        const searchParam = (_b = (_a = globalSchema.types[searchRequest.resourceType]) === null || _a === void 0 ? void 0 : _a.searchParams) === null || _b === void 0 ? void 0 : _b[filter.code];
-        switch (searchParam === null || searchParam === void 0 ? void 0 : searchParam.type) {
+        const searchParam = globalSchema.types[searchRequest.resourceType]?.searchParams?.[filter.code];
+        switch (searchParam?.type) {
             case 'reference':
                 return matchesReferenceFilter(resource, filter, searchParam);
             case 'string':
@@ -11352,7 +11356,7 @@
                 // In previous versions, the resource type was not required in compartment values
                 // So, "123" would match "Patient/123"
                 // We need to maintain this behavior for backwards compatibility
-                match = references.some((reference) => reference === null || reference === void 0 ? void 0 : reference.endsWith('/' + filterValue));
+                match = references.some((reference) => reference?.endsWith('/' + filterValue));
             }
             if (match) {
                 return !negated;
@@ -11620,8 +11624,7 @@
     }
     class OperationOutcomeError extends Error {
         constructor(outcome) {
-            var _a, _b;
-            super((_b = (_a = outcome === null || outcome === void 0 ? void 0 : outcome.issue) === null || _a === void 0 ? void 0 : _a[0].details) === null || _b === void 0 ? void 0 : _b.text);
+            super(outcome?.issue?.[0].details?.text);
             this.outcome = outcome;
         }
     }
@@ -11631,7 +11634,6 @@
      * @returns A display string for the error.
      */
     function normalizeErrorString(error) {
-        var _a, _b, _c, _d;
         if (!error) {
             return 'Unknown error';
         }
@@ -11643,7 +11645,7 @@
         }
         if (typeof error === 'object' && 'resourceType' in error) {
             const outcome = error;
-            return (_d = (_c = (_b = (_a = outcome.issue) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.details) === null || _c === void 0 ? void 0 : _c.text) !== null && _d !== void 0 ? _d : 'Unknown error';
+            return outcome.issue?.[0]?.details?.text ?? 'Unknown error';
         }
         return JSON.stringify(error);
     }
@@ -11716,6 +11718,7 @@
     exports.formatFamilyName = formatFamilyName;
     exports.formatGivenName = formatGivenName;
     exports.formatHumanName = formatHumanName;
+    exports.formatMoney = formatMoney;
     exports.formatObservationValue = formatObservationValue;
     exports.formatPeriod = formatPeriod;
     exports.formatQuantity = formatQuantity;
@@ -11782,4 +11785,4 @@
     exports.unauthorized = unauthorized;
 
 }));
-//# sourceMappingURL=index.js.map
+//# sourceMappingURL=index.cjs.map