@medplum/core 2.0.14 → 2.0.15

package/dist/cjs/index.cjs

@@ -38,52 +38,20 @@
         return value;
     }
 
-    /******************************************************************************
-    Copyright (c) Microsoft Corporation.
-
-    Permission to use, copy, modify, and/or distribute this software for any
-    purpose with or without fee is hereby granted.
-
-    THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
-    REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
-    AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
-    INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
-    LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR
-    OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-    PERFORMANCE OF THIS SOFTWARE.
-    ***************************************************************************** */
-
-    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");
-        return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-    }
-
-    function __classPrivateFieldSet(receiver, state, value, kind, f) {
-        if (kind === "m") throw new TypeError("Private method is not writable");
-        if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-        if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-        return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-    }
-
-    var _LRUCache_instances, _LRUCache_max, _LRUCache_cache, _LRUCache_first;
     /**
      * LRU cache (least recently used)
      * Source: https://stackoverflow.com/a/46432113
      */
     class LRUCache {
         constructor(max = 10) {
-            _LRUCache_instances.add(this);
-            _LRUCache_max.set(this, void 0);
-            _LRUCache_cache.set(this, void 0);
-            __classPrivateFieldSet(this, _LRUCache_max, max, "f");
-            __classPrivateFieldSet(this, _LRUCache_cache, new Map(), "f");
+            this.max = max;
+            this.cache = new Map();
         }
         /**
          * Deletes all values from the cache.
          */
         clear() {
-            __classPrivateFieldGet(this, _LRUCache_cache, "f").clear();
+            this.cache.clear();
         }
         /**
          * Returns the value for the given key.
@@ -91,10 +59,10 @@
          * @returns The value if found; undefined otherwise.
          */
         get(key) {
-            const item = __classPrivateFieldGet(this, _LRUCache_cache, "f").get(key);
+            const item = this.cache.get(key);
             if (item) {
-                __classPrivateFieldGet(this, _LRUCache_cache, "f").delete(key);
-                __classPrivateFieldGet(this, _LRUCache_cache, "f").set(key, item);
+                this.cache.delete(key);
+                this.cache.set(key, item);
             }
             return item;
         }
@@ -104,33 +72,33 @@
          * @param val The value to set.
          */
         set(key, val) {
-            if (__classPrivateFieldGet(this, _LRUCache_cache, "f").has(key)) {
-                __classPrivateFieldGet(this, _LRUCache_cache, "f").delete(key);
+            if (this.cache.has(key)) {
+                this.cache.delete(key);
             }
-            else if (__classPrivateFieldGet(this, _LRUCache_cache, "f").size >= __classPrivateFieldGet(this, _LRUCache_max, "f")) {
-                __classPrivateFieldGet(this, _LRUCache_cache, "f").delete(__classPrivateFieldGet(this, _LRUCache_instances, "m", _LRUCache_first).call(this));
+            else if (this.cache.size >= this.max) {
+                this.cache.delete(this.first());
             }
-            __classPrivateFieldGet(this, _LRUCache_cache, "f").set(key, val);
+            this.cache.set(key, val);
         }
         /**
          * Deletes the value for the given key.
          * @param key The key to delete.
          */
         delete(key) {
-            __classPrivateFieldGet(this, _LRUCache_cache, "f").delete(key);
+            this.cache.delete(key);
         }
         /**
          * Returns the list of all keys in the cache.
          * @returns The array of keys in the cache.
          */
         keys() {
-            return __classPrivateFieldGet(this, _LRUCache_cache, "f").keys();
+            return this.cache.keys();
+        }
+        first() {
+            // This works because the Map class maintains ordered keys.
+            return this.cache.keys().next().value;
         }
     }
-    _LRUCache_max = new WeakMap(), _LRUCache_cache = new WeakMap(), _LRUCache_instances = new WeakSet(), _LRUCache_first = function _LRUCache_first() {
-        // This works because the Map class maintains ordered keys.
-        return __classPrivateFieldGet(this, _LRUCache_cache, "f").keys().next().value;
-    };
 
     /**
      * Formats a FHIR Address as a string.
@@ -1141,20 +1109,18 @@
     /*
      * Based on: https://developer.mozilla.org/en-US/docs/Web/API/EventTarget
      */
-    var _EventTarget_listeners;
     class EventTarget {
         constructor() {
-            _EventTarget_listeners.set(this, void 0);
-            __classPrivateFieldSet(this, _EventTarget_listeners, {}, "f");
+            this.listeners = {};
         }
         addEventListener(type, callback) {
-            if (!__classPrivateFieldGet(this, _EventTarget_listeners, "f")[type]) {
-                __classPrivateFieldGet(this, _EventTarget_listeners, "f")[type] = [];
+            if (!this.listeners[type]) {
+                this.listeners[type] = [];
             }
-            __classPrivateFieldGet(this, _EventTarget_listeners, "f")[type].push(callback);
+            this.listeners[type].push(callback);
         }
         removeEventListeneer(type, callback) {
-            const array = __classPrivateFieldGet(this, _EventTarget_listeners, "f")[type];
+            const array = this.listeners[type];
             if (!array) {
                 return;
             }
@@ -1166,14 +1132,44 @@
             }
         }
         dispatchEvent(event) {
-            const array = __classPrivateFieldGet(this, _EventTarget_listeners, "f")[event.type];
+            const array = this.listeners[event.type];
             if (array) {
                 array.forEach((listener) => listener.call(this, event));
             }
             return !event.defaultPrevented;
         }
     }
-    _EventTarget_listeners = new WeakMap();
+
+    /**
+     * Decodes a base64 string.
+     * Handles both browser and Node environments.
+     * @param data The base-64 encoded input string.
+     * @returns The decoded string.
+     */
+    function decodeBase64(data) {
+        if (typeof window !== 'undefined') {
+            return window.atob(data);
+        }
+        if (typeof Buffer !== 'undefined') {
+            return Buffer.from(data, 'base64').toString('binary');
+        }
+        throw new Error('Unable to decode base64');
+    }
+    /**
+     * Encodes a base64 string.
+     * Handles both browser and Node environments.
+     * @param data The unencoded input string.
+     * @returns The base-64 encoded string.
+     */
+    function encodeBase64(data) {
+        if (typeof window !== 'undefined') {
+            return window.btoa(data);
+        }
+        if (typeof Buffer !== 'undefined') {
+            return Buffer.from(data, 'binary').toString('base64');
+        }
+        throw new Error('Unable to encode base64');
+    }
 
     /**
      * Decodes a section of a JWT.
@@ -1190,15 +1186,6 @@
         const jsonPayload = decodeURIComponent(uriEncodedPayload);
         return JSON.parse(jsonPayload);
     }
-    function decodeBase64(data) {
-        if (typeof window !== 'undefined') {
-            return window.atob(data);
-        }
-        if (typeof Buffer !== 'undefined') {
-            return Buffer.from(data, 'base64').toString('binary');
-        }
-        throw new Error('Unable to decode base64');
-    }
     /**
      * Parses the JWT payload.
      * @param token JWT token
@@ -1460,7 +1447,7 @@
         return strs.length > 0 ? strs.join('; ') : 'Unknown error';
     }
 
-    var _ReadablePromise_suspender, _ReadablePromise_status, _ReadablePromise_response, _ReadablePromise_error, _a;
+    var _a;
     /**
      * The ReadablePromise class wraps a request promise suitable for React Suspense.
      * See: https://blog.logrocket.com/react-suspense-data-fetching/#wrappromise-js
@@ -1469,33 +1456,30 @@
     class ReadablePromise {
         constructor(requestPromise) {
             this[_a] = 'ReadablePromise';
-            _ReadablePromise_suspender.set(this, void 0);
-            _ReadablePromise_status.set(this, 'pending');
-            _ReadablePromise_response.set(this, void 0);
-            _ReadablePromise_error.set(this, void 0);
-            __classPrivateFieldSet(this, _ReadablePromise_suspender, requestPromise.then((res) => {
-                __classPrivateFieldSet(this, _ReadablePromise_status, 'success', "f");
-                __classPrivateFieldSet(this, _ReadablePromise_response, res, "f");
+            this.status = 'pending';
+            this.suspender = requestPromise.then((res) => {
+                this.status = 'success';
+                this.response = res;
                 return res;
             }, (err) => {
-                __classPrivateFieldSet(this, _ReadablePromise_status, 'error', "f");
-                __classPrivateFieldSet(this, _ReadablePromise_error, err, "f");
+                this.status = 'error';
+                this.error = err;
                 throw err;
-            }), "f");
+            });
         }
         /**
          * Returns true if the promise is pending.
          * @returns True if the Promise is pending.
          */
         isPending() {
-            return __classPrivateFieldGet(this, _ReadablePromise_status, "f") === 'pending';
+            return this.status === 'pending';
         }
         /**
          * Returns true if the promise resolved successfully.
          * @returns True if the Promise resolved successfully.
          */
         isOk() {
-            return __classPrivateFieldGet(this, _ReadablePromise_status, "f") === 'success';
+            return this.status === 'success';
         }
         /**
          * Attempts to read the value of the promise.
@@ -1505,13 +1489,13 @@
          * @returns The resolved value of the Promise.
          */
         read() {
-            switch (__classPrivateFieldGet(this, _ReadablePromise_status, "f")) {
+            switch (this.status) {
                 case 'pending':
-                    throw __classPrivateFieldGet(this, _ReadablePromise_suspender, "f");
+                    throw this.suspender;
                 case 'error':
-                    throw __classPrivateFieldGet(this, _ReadablePromise_error, "f");
+                    throw this.error;
                 default:
-                    return __classPrivateFieldGet(this, _ReadablePromise_response, "f");
+                    return this.response;
             }
         }
         /**
@@ -1521,7 +1505,7 @@
          * @returns A Promise for the completion of which ever callback is executed.
          */
         then(onfulfilled, onrejected) {
-            return __classPrivateFieldGet(this, _ReadablePromise_suspender, "f").then(onfulfilled, onrejected);
+            return this.suspender.then(onfulfilled, onrejected);
         }
         /**
          * Attaches a callback for only the rejection of the Promise.
@@ -1529,7 +1513,7 @@
          * @returns A Promise for the completion of the callback.
          */
         catch(onrejected) {
-            return __classPrivateFieldGet(this, _ReadablePromise_suspender, "f").catch(onrejected);
+            return this.suspender.catch(onrejected);
         }
         /**
          * Attaches a callback that is invoked when the Promise is settled (fulfilled or rejected). The
@@ -1538,12 +1522,11 @@
          * @returns A Promise for the completion of the callback.
          */
         finally(onfinally) {
-            return __classPrivateFieldGet(this, _ReadablePromise_suspender, "f").finally(onfinally);
+            return this.suspender.finally(onfinally);
         }
     }
-    _ReadablePromise_suspender = new WeakMap(), _ReadablePromise_status = new WeakMap(), _ReadablePromise_response = new WeakMap(), _ReadablePromise_error = new WeakMap(), _a = Symbol.toStringTag;
+    _a = Symbol.toStringTag;
 
-    var _ClientStorage_storage, _MemoryStorage_data;
     /**
      * The ClientStorage class is a utility class for storing strings and objects.
      *
@@ -1553,21 +1536,20 @@
      */
     class ClientStorage {
         constructor() {
-            _ClientStorage_storage.set(this, void 0);
-            __classPrivateFieldSet(this, _ClientStorage_storage, typeof localStorage !== 'undefined' ? localStorage : new MemoryStorage(), "f");
+            this.storage = typeof localStorage !== 'undefined' ? localStorage : new MemoryStorage();
         }
         clear() {
-            __classPrivateFieldGet(this, _ClientStorage_storage, "f").clear();
+            this.storage.clear();
         }
         getString(key) {
-            return __classPrivateFieldGet(this, _ClientStorage_storage, "f").getItem(key) || undefined;
+            return this.storage.getItem(key) || undefined;
         }
         setString(key, value) {
             if (value) {
-                __classPrivateFieldGet(this, _ClientStorage_storage, "f").setItem(key, value);
+                this.storage.setItem(key, value);
             }
             else {
-                __classPrivateFieldGet(this, _ClientStorage_storage, "f").removeItem(key);
+                this.storage.removeItem(key);
             }
         }
         getObject(key) {
@@ -1578,58 +1560,55 @@
             this.setString(key, value ? stringify(value) : undefined);
         }
     }
-    _ClientStorage_storage = new WeakMap();
     /**
      * The MemoryStorage class is a minimal in-memory implementation of the Storage interface.
      */
     class MemoryStorage {
         constructor() {
-            _MemoryStorage_data.set(this, void 0);
-            __classPrivateFieldSet(this, _MemoryStorage_data, new Map(), "f");
+            this.data = new Map();
         }
         /**
          * Returns the number of key/value pairs.
          */
         get length() {
-            return __classPrivateFieldGet(this, _MemoryStorage_data, "f").size;
+            return this.data.size;
         }
         /**
          * Removes all key/value pairs, if there are any.
          */
         clear() {
-            __classPrivateFieldGet(this, _MemoryStorage_data, "f").clear();
+            this.data.clear();
         }
         /**
          * Returns the current value associated with the given key, or null if the given key does not exist.
          */
         getItem(key) {
-            return __classPrivateFieldGet(this, _MemoryStorage_data, "f").get(key) ?? null;
+            return this.data.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.
          */
         setItem(key, value) {
             if (value) {
-                __classPrivateFieldGet(this, _MemoryStorage_data, "f").set(key, value);
+                this.data.set(key, value);
             }
             else {
-                __classPrivateFieldGet(this, _MemoryStorage_data, "f").delete(key);
+                this.data.delete(key);
             }
         }
         /**
          * Removes the key/value pair with the given key, if a key/value pair with the given key exists.
          */
         removeItem(key) {
-            __classPrivateFieldGet(this, _MemoryStorage_data, "f").delete(key);
+            this.data.delete(key);
         }
         /**
          * Returns the name of the nth key, or null if n is greater than or equal to the number of key/value pairs.
          */
         key(index) {
-            return Array.from(__classPrivateFieldGet(this, _MemoryStorage_data, "f").keys())[index];
+            return Array.from(this.data.keys())[index];
         }
     }
-    _MemoryStorage_data = new WeakMap();
 
     var types = {
     	Element: {
@@ -6402,9 +6381,7 @@
     const globalSchema = baseSchema;
 
     // 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_fhirBaseUrl, _MedplumClient_authorizeUrl, _MedplumClient_tokenUrl, _MedplumClient_logoutUrl, _MedplumClient_exchangeUrl, _MedplumClient_onUnauthenticated, _MedplumClient_autoBatchTime, _MedplumClient_autoBatchQueue, _MedplumClient_clientId, _MedplumClient_clientSecret, _MedplumClient_autoBatchTimerId, _MedplumClient_accessToken, _MedplumClient_refreshToken, _MedplumClient_refreshPromise, _MedplumClient_profilePromise, _MedplumClient_profile, _MedplumClient_config, _MedplumClient_addLogin, _MedplumClient_refreshProfile, _MedplumClient_getCacheEntry, _MedplumClient_setCacheEntry, _MedplumClient_cacheResource, _MedplumClient_deleteCacheEntry, _MedplumClient_request, _MedplumClient_fetchWithRetry, _MedplumClient_executeAutoBatch, _MedplumClient_addFetchOptionsDefaults, _MedplumClient_setRequestContentType, _MedplumClient_setRequestBody, _MedplumClient_handleUnauthenticated, _MedplumClient_requestAuthorization, _MedplumClient_refresh, _MedplumClient_fetchTokens, _MedplumClient_verifyTokens, _MedplumClient_setupStorageListener;
-    const MEDPLUM_VERSION = "2.0.14-8c7457fd";
+    const MEDPLUM_VERSION = "2.0.15-025c3c04";
     const DEFAULT_BASE_URL = 'https://api.medplum.com/';
     const DEFAULT_RESOURCE_CACHE_SIZE = 1000;
     const DEFAULT_CACHE_TIME = 60000; // 60 seconds
@@ -6467,57 +6444,44 @@
     class MedplumClient extends EventTarget {
         constructor(options) {
             super();
-            _MedplumClient_instances.add(this);
-            _MedplumClient_fetch.set(this, void 0);
-            _MedplumClient_createPdf.set(this, void 0);
-            _MedplumClient_storage.set(this, void 0);
-            _MedplumClient_requestCache.set(this, void 0);
-            _MedplumClient_cacheTime.set(this, void 0);
-            _MedplumClient_baseUrl.set(this, void 0);
-            _MedplumClient_fhirBaseUrl.set(this, void 0);
-            _MedplumClient_authorizeUrl.set(this, void 0);
-            _MedplumClient_tokenUrl.set(this, void 0);
-            _MedplumClient_logoutUrl.set(this, void 0);
-            _MedplumClient_exchangeUrl.set(this, void 0);
-            _MedplumClient_onUnauthenticated.set(this, void 0);
-            _MedplumClient_autoBatchTime.set(this, void 0);
-            _MedplumClient_autoBatchQueue.set(this, void 0);
-            _MedplumClient_clientId.set(this, void 0);
-            _MedplumClient_clientSecret.set(this, void 0);
-            _MedplumClient_autoBatchTimerId.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?.baseUrl) {
                 if (!options.baseUrl.startsWith('http')) {
                     throw new Error('Base URL must start with http or https');
                 }
             }
-            __classPrivateFieldSet(this, _MedplumClient_fetch, options?.fetch || getDefaultFetch(), "f");
-            __classPrivateFieldSet(this, _MedplumClient_storage, options?.storage || new ClientStorage(), "f");
-            __classPrivateFieldSet(this, _MedplumClient_createPdf, options?.createPdf, "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_fhirBaseUrl, __classPrivateFieldGet(this, _MedplumClient_baseUrl, "f") + (ensureTrailingSlash(options?.fhirUrlPath) || 'fhir/R4/'), "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_exchangeUrl, __classPrivateFieldGet(this, _MedplumClient_baseUrl, "f") + 'auth/exchange', "f");
-            __classPrivateFieldSet(this, _MedplumClient_onUnauthenticated, options?.onUnauthenticated, "f");
-            __classPrivateFieldSet(this, _MedplumClient_autoBatchTime, options?.autoBatchTime ?? 0, "f");
-            __classPrivateFieldSet(this, _MedplumClient_autoBatchQueue, [], "f");
+            this.fetch = options?.fetch || getDefaultFetch();
+            this.storage = options?.storage || new ClientStorage();
+            this.createPdfImpl = options?.createPdf;
+            this.baseUrl = ensureTrailingSlash(options?.baseUrl) || DEFAULT_BASE_URL;
+            this.fhirBaseUrl = this.baseUrl + (ensureTrailingSlash(options?.fhirUrlPath) || 'fhir/R4/');
+            this.clientId = options?.clientId || '';
+            this.authorizeUrl = options?.authorizeUrl || this.baseUrl + 'oauth2/authorize';
+            this.tokenUrl = options?.tokenUrl || this.baseUrl + 'oauth2/token';
+            this.logoutUrl = options?.logoutUrl || this.baseUrl + 'oauth2/logout';
+            this.exchangeUrl = this.baseUrl + 'auth/exchange';
+            this.onUnauthenticated = options?.onUnauthenticated;
+            this.cacheTime = options?.cacheTime ?? DEFAULT_CACHE_TIME;
+            if (this.cacheTime > 0) {
+                this.requestCache = new LRUCache(options?.resourceCacheSize ?? DEFAULT_RESOURCE_CACHE_SIZE);
+            }
+            else {
+                this.requestCache = undefined;
+            }
+            if (options?.autoBatchTime) {
+                this.autoBatchTime = options?.autoBatchTime ?? 0;
+                this.autoBatchQueue = [];
+            }
+            else {
+                this.autoBatchTime = 0;
+                this.autoBatchQueue = undefined;
+            }
             const activeLogin = this.getActiveLogin();
             if (activeLogin) {
-                __classPrivateFieldSet(this, _MedplumClient_accessToken, activeLogin.accessToken, "f");
-                __classPrivateFieldSet(this, _MedplumClient_refreshToken, activeLogin.refreshToken, "f");
-                __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_refreshProfile).call(this).catch(console.log);
+                this.accessToken = activeLogin.accessToken;
+                this.refreshToken = activeLogin.refreshToken;
+                this.refreshProfile().catch(console.log);
             }
-            __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_setupStorageListener).call(this);
+            this.setupStorageListener();
         }
         /**
          * Returns the current base URL for all API requests.
@@ -6527,14 +6491,14 @@
          * @returns The current base URL for all API requests.
          */
         getBaseUrl() {
-            return __classPrivateFieldGet(this, _MedplumClient_baseUrl, "f");
+            return this.baseUrl;
         }
         /**
          * Clears all auth state including local storage and session storage.
          * @category Authentication
          */
         clear() {
-            __classPrivateFieldGet(this, _MedplumClient_storage, "f").clear();
+            this.storage.clear();
             this.clearActiveLogin();
         }
         /**
@@ -6543,12 +6507,12 @@
          * @category Authentication
          */
         clearActiveLogin() {
-            __classPrivateFieldGet(this, _MedplumClient_storage, "f").setString('activeLogin', undefined);
-            __classPrivateFieldGet(this, _MedplumClient_requestCache, "f").clear();
-            __classPrivateFieldSet(this, _MedplumClient_accessToken, undefined, "f");
-            __classPrivateFieldSet(this, _MedplumClient_refreshToken, undefined, "f");
-            __classPrivateFieldSet(this, _MedplumClient_profile, undefined, "f");
-            __classPrivateFieldSet(this, _MedplumClient_config, undefined, "f");
+            this.storage.setString('activeLogin', undefined);
+            this.requestCache?.clear();
+            this.accessToken = undefined;
+            this.refreshToken = undefined;
+            this.profile = undefined;
+            this.config = undefined;
             this.dispatchEvent({ type: 'change' });
         }
         /**
@@ -6558,7 +6522,7 @@
          */
         invalidateUrl(url) {
             url = url.toString();
-            __classPrivateFieldGet(this, _MedplumClient_requestCache, "f").delete(url);
+            this.requestCache?.delete(url);
         }
         /**
          * Invalidates all cached search results or cached requests for the given resourceType.
@@ -6567,9 +6531,11 @@
          */
         invalidateSearches(resourceType) {
             const url = 'fhir/R4/' + resourceType;
-            for (const key of __classPrivateFieldGet(this, _MedplumClient_requestCache, "f").keys()) {
-                if (key.endsWith(url) || key.includes(url + '?')) {
-                    __classPrivateFieldGet(this, _MedplumClient_requestCache, "f").delete(key);
+            if (this.requestCache) {
+                for (const key of this.requestCache.keys()) {
+                    if (key.endsWith(url) || key.includes(url + '?')) {
+                        this.requestCache.delete(key);
+                    }
                 }
             }
         }
@@ -6587,30 +6553,30 @@
          */
         get(url, options = {}) {
             url = url.toString();
-            const cached = __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_getCacheEntry).call(this, url, options);
+            const cached = this.getCacheEntry(url, options);
             if (cached) {
                 return cached.value;
             }
             let promise;
-            if (url.startsWith(__classPrivateFieldGet(this, _MedplumClient_fhirBaseUrl, "f")) && __classPrivateFieldGet(this, _MedplumClient_autoBatchTime, "f") > 0) {
+            if (url.startsWith(this.fhirBaseUrl) && this.autoBatchQueue) {
                 promise = new Promise((resolve, reject) => {
-                    __classPrivateFieldGet(this, _MedplumClient_autoBatchQueue, "f").push({
+                    this.autoBatchQueue.push({
                         method: 'GET',
-                        url: url.replace(__classPrivateFieldGet(this, _MedplumClient_fhirBaseUrl, "f"), ''),
+                        url: url.replace(this.fhirBaseUrl, ''),
                         options,
                         resolve,
                         reject,
                     });
-                    if (!__classPrivateFieldGet(this, _MedplumClient_autoBatchTimerId, "f")) {
-                        __classPrivateFieldSet(this, _MedplumClient_autoBatchTimerId, setTimeout(() => __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_executeAutoBatch).call(this), __classPrivateFieldGet(this, _MedplumClient_autoBatchTime, "f")), "f");
+                    if (!this.autoBatchTimerId) {
+                        this.autoBatchTimerId = setTimeout(() => this.executeAutoBatch(), this.autoBatchTime);
                     }
                 });
             }
             else {
-                promise = __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_request).call(this, 'GET', url, options);
+                promise = this.request('GET', url, options);
             }
             const readablePromise = new ReadablePromise(promise);
-            __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_setCacheEntry).call(this, url, readablePromise);
+            this.setCacheEntry(url, readablePromise);
             return readablePromise;
         }
         /**
@@ -6630,13 +6596,13 @@
         post(url, body, contentType, options = {}) {
             url = url.toString();
             if (body) {
-                __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_setRequestBody).call(this, options, body);
+                this.setRequestBody(options, body);
             }
             if (contentType) {
-                __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_setRequestContentType).call(this, options, contentType);
+                this.setRequestContentType(options, contentType);
             }
             this.invalidateUrl(url);
-            return __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_request).call(this, 'POST', url, options);
+            return this.request('POST', url, options);
         }
         /**
          * Makes an HTTP PUT request to the specified URL.
@@ -6655,13 +6621,13 @@
         put(url, body, contentType, options = {}) {
             url = url.toString();
             if (body) {
-                __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_setRequestBody).call(this, options, body);
+                this.setRequestBody(options, body);
             }
             if (contentType) {
-                __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_setRequestContentType).call(this, options, contentType);
+                this.setRequestContentType(options, contentType);
             }
             this.invalidateUrl(url);
-            return __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_request).call(this, 'PUT', url, options);
+            return this.request('PUT', url, options);
         }
         /**
          * Makes an HTTP PATCH request to the specified URL.
@@ -6678,10 +6644,10 @@
          */
         patch(url, operations, options = {}) {
             url = url.toString();
-            __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_setRequestBody).call(this, options, operations);
-            __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_setRequestContentType).call(this, options, PATCH_CONTENT_TYPE);
+            this.setRequestBody(options, operations);
+            this.setRequestContentType(options, PATCH_CONTENT_TYPE);
             this.invalidateUrl(url);
-            return __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_request).call(this, 'PATCH', url, options);
+            return this.request('PATCH', url, options);
         }
         /**
          * Makes an HTTP DELETE request to the specified URL.
@@ -6699,7 +6665,7 @@
         delete(url, options = {}) {
             url = url.toString();
             this.invalidateUrl(url);
-            return __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_request).call(this, 'DELETE', url, options);
+            return this.request('DELETE', url, options);
         }
         /**
          * Initiates a new user flow.
@@ -6751,7 +6717,7 @@
         async startLogin(loginRequest) {
             return this.post('auth/login', {
                 ...(await this.ensureCodeChallenge(loginRequest)),
-                clientId: loginRequest.clientId ?? __classPrivateFieldGet(this, _MedplumClient_clientId, "f"),
+                clientId: loginRequest.clientId ?? this.clientId,
                 scope: loginRequest.scope,
             });
         }
@@ -6766,7 +6732,7 @@
         async startGoogleLogin(loginRequest) {
             return this.post('auth/google', {
                 ...(await this.ensureCodeChallenge(loginRequest)),
-                clientId: loginRequest.clientId ?? __classPrivateFieldGet(this, _MedplumClient_clientId, "f"),
+                clientId: loginRequest.clientId ?? this.clientId,
                 scope: loginRequest.scope,
             });
         }
@@ -6790,7 +6756,7 @@
          * @category Authentication
          */
         async signOut() {
-            await this.post(__classPrivateFieldGet(this, _MedplumClient_logoutUrl, "f"), {});
+            await this.post(this.logoutUrl, {});
             this.clear();
         }
         /**
@@ -6804,7 +6770,7 @@
             const urlParams = new URLSearchParams(window.location.search);
             const code = urlParams.get('code');
             if (!code) {
-                await __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_requestAuthorization).call(this, loginParams);
+                await this.requestAuthorization(loginParams);
                 return undefined;
             }
             else {
@@ -6817,7 +6783,7 @@
          * @category Authentication
          */
         signOutWithRedirect() {
-            window.location.assign(__classPrivateFieldGet(this, _MedplumClient_logoutUrl, "f"));
+            window.location.assign(this.logoutUrl);
         }
         /**
          * Initiates sign in with an external identity provider.
@@ -6838,15 +6804,15 @@
          * @category Authentication
          */
         async exchangeExternalAccessToken(token, clientId) {
-            clientId = clientId || __classPrivateFieldGet(this, _MedplumClient_clientId, "f");
+            clientId = clientId || this.clientId;
             if (!clientId) {
                 throw new Error('MedplumClient is missing clientId');
             }
-            const response = await __classPrivateFieldGet(this, _MedplumClient_fetch, "f").call(this, __classPrivateFieldGet(this, _MedplumClient_exchangeUrl, "f"), {
+            const response = await this.fetch(this.exchangeUrl, {
                 method: 'POST',
                 headers: { 'Content-Type': 'application/json' },
                 body: JSON.stringify({
-                    clientId: __classPrivateFieldGet(this, _MedplumClient_clientId, "f"),
+                    clientId: this.clientId,
                     externalAccessToken: token,
                 }),
                 credentials: 'include',
@@ -6856,7 +6822,7 @@
                 throw new Error('Failed to fetch tokens');
             }
             const tokens = await response.json();
-            await __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_verifyTokens).call(this, tokens);
+            await this.verifyTokens(tokens);
             return this.getProfile();
         }
         /**
@@ -6885,7 +6851,7 @@
          * @returns The well-formed FHIR URL.
          */
         fhirUrl(...path) {
-            return new URL(__classPrivateFieldGet(this, _MedplumClient_fhirBaseUrl, "f") + path.join('/'));
+            return new URL(this.fhirBaseUrl + path.join('/'));
         }
         /**
          * Builds a FHIR search URL from a search query or structured query object.
@@ -6953,7 +6919,7 @@
         search(resourceType, query, options = {}) {
             const url = this.fhirSearchUrl(resourceType, query);
             const cacheKey = url.toString() + '-search';
-            const cached = __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_getCacheEntry).call(this, cacheKey, options);
+            const cached = this.getCacheEntry(cacheKey, options);
             if (cached) {
                 return cached.value;
             }
@@ -6961,12 +6927,12 @@
                 const bundle = await this.get(url, options);
                 if (bundle.entry) {
                     for (const entry of bundle.entry) {
-                        __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_cacheResource).call(this, entry.resource);
+                        this.cacheResource(entry.resource);
                     }
                 }
                 return bundle;
             })());
-            __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_setCacheEntry).call(this, cacheKey, promise);
+            this.setCacheEntry(cacheKey, promise);
             return promise;
         }
         /**
@@ -6996,12 +6962,12 @@
             url.searchParams.set('_count', '1');
             url.searchParams.sort();
             const cacheKey = url.toString() + '-searchOne';
-            const cached = __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_getCacheEntry).call(this, cacheKey, options);
+            const cached = this.getCacheEntry(cacheKey, options);
             if (cached) {
                 return cached.value;
             }
             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);
+            this.setCacheEntry(cacheKey, promise);
             return promise;
         }
         /**
@@ -7029,12 +6995,12 @@
         searchResources(resourceType, query, options = {}) {
             const url = this.fhirSearchUrl(resourceType, query);
             const cacheKey = url.toString() + '-searchResources';
-            const cached = __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_getCacheEntry).call(this, cacheKey, options);
+            const cached = this.getCacheEntry(cacheKey, options);
             if (cached) {
                 return cached.value;
             }
             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);
+            this.setCacheEntry(cacheKey, promise);
             return promise;
         }
         /**
@@ -7095,7 +7061,7 @@
          * @returns The resource if it is available in the cache; undefined otherwise.
          */
         getCached(resourceType, id) {
-            const cached = __classPrivateFieldGet(this, _MedplumClient_requestCache, "f").get(this.fhirUrl(resourceType, id).toString())?.value;
+            const cached = this.requestCache?.get(this.fhirUrl(resourceType, id).toString())?.value;
             return cached && cached.isOk() ? cached.read() : undefined;
         }
         /**
@@ -7197,7 +7163,7 @@
                 return Promise.resolve(globalSchema);
             }
             const cacheKey = resourceType + '-requestSchema';
-            const cached = __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_getCacheEntry).call(this, cacheKey, undefined);
+            const cached = this.getCacheEntry(cacheKey, undefined);
             if (cached) {
                 return cached.value;
             }
@@ -7240,7 +7206,7 @@
                 }
                 return globalSchema;
             })());
-            __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_setCacheEntry).call(this, cacheKey, promise);
+            this.setCacheEntry(cacheKey, promise);
             return promise;
         }
         /**
@@ -7438,7 +7404,7 @@
                 };
                 xhr.open('POST', url);
                 xhr.withCredentials = true;
-                xhr.setRequestHeader('Authorization', 'Bearer ' + __classPrivateFieldGet(this, _MedplumClient_accessToken, "f"));
+                xhr.setRequestHeader('Authorization', 'Bearer ' + this.accessToken);
                 xhr.setRequestHeader('Cache-Control', 'no-cache, no-store, max-age=0');
                 xhr.setRequestHeader('Content-Type', contentType);
                 xhr.setRequestHeader('X-Medplum', 'extended');
@@ -7468,10 +7434,10 @@
          * @returns The result of the create operation.
          */
         async createPdf(docDefinition, filename, tableLayouts, fonts) {
-            if (!__classPrivateFieldGet(this, _MedplumClient_createPdf, "f")) {
+            if (!this.createPdfImpl) {
                 throw new Error('PDF creation not enabled');
             }
-            const blob = await __classPrivateFieldGet(this, _MedplumClient_createPdf, "f").call(this, docDefinition, tableLayouts, fonts);
+            const blob = await this.createPdfImpl(docDefinition, tableLayouts, fonts);
             return this.createBinary(blob, filename, 'application/pdf');
         }
         /**
@@ -7549,7 +7515,7 @@
                 // return result ?? resource;
                 result = resource;
             }
-            __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_cacheResource).call(this, result);
+            this.cacheResource(result);
             return result;
         }
         /**
@@ -7597,7 +7563,7 @@
          * @returns The result of the delete operation.
          */
         deleteResource(resourceType, id) {
-            __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_deleteCacheEntry).call(this, this.fhirUrl(resourceType, id).toString());
+            this.deleteCacheEntry(this.fhirUrl(resourceType, id).toString());
             this.invalidateSearches(resourceType);
             return this.delete(this.fhirUrl(resourceType, id));
         }
@@ -7801,61 +7767,80 @@
          * @returns The Login State
          */
         getActiveLogin() {
-            return __classPrivateFieldGet(this, _MedplumClient_storage, "f").getObject('activeLogin');
+            return this.storage.getObject('activeLogin');
         }
         /**
          * @category Authentication
          */
         async setActiveLogin(login) {
             this.clearActiveLogin();
-            __classPrivateFieldSet(this, _MedplumClient_accessToken, login.accessToken, "f");
-            __classPrivateFieldSet(this, _MedplumClient_refreshToken, login.refreshToken, "f");
-            __classPrivateFieldGet(this, _MedplumClient_storage, "f").setObject('activeLogin', login);
-            __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_addLogin).call(this, login);
-            __classPrivateFieldSet(this, _MedplumClient_refreshPromise, undefined, "f");
-            await __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_refreshProfile).call(this);
+            this.accessToken = login.accessToken;
+            this.refreshToken = login.refreshToken;
+            this.storage.setObject('activeLogin', login);
+            this.addLogin(login);
+            this.refreshPromise = undefined;
+            await this.refreshProfile();
         }
         /**
          * Returns the current access token.
          * @category Authentication
          */
         getAccessToken() {
-            return __classPrivateFieldGet(this, _MedplumClient_accessToken, "f");
+            return this.accessToken;
         }
         /**
          * Sets the current access token.
          * @category Authentication
          */
         setAccessToken(accessToken) {
-            __classPrivateFieldSet(this, _MedplumClient_accessToken, accessToken, "f");
-            __classPrivateFieldSet(this, _MedplumClient_refreshToken, undefined, "f");
-            __classPrivateFieldSet(this, _MedplumClient_profile, undefined, "f");
-            __classPrivateFieldSet(this, _MedplumClient_config, undefined, "f");
+            this.accessToken = accessToken;
+            this.refreshToken = undefined;
+            this.profile = undefined;
+            this.config = undefined;
         }
         /**
          * @category Authentication
          */
         getLogins() {
-            return __classPrivateFieldGet(this, _MedplumClient_storage, "f").getObject('logins') ?? [];
+            return this.storage.getObject('logins') ?? [];
+        }
+        addLogin(newLogin) {
+            const logins = this.getLogins().filter((login) => login.profile?.reference !== newLogin.profile?.reference);
+            logins.push(newLogin);
+            this.storage.setObject('logins', logins);
+        }
+        async refreshProfile() {
+            this.profilePromise = new Promise((resolve, reject) => {
+                this.get('auth/me')
+                    .then((result) => {
+                    this.profilePromise = undefined;
+                    this.profile = result.profile;
+                    this.config = result.config;
+                    this.dispatchEvent({ type: 'change' });
+                    resolve(this.profile);
+                })
+                    .catch(reject);
+            });
+            return this.profilePromise;
         }
         /**
          * @category Authentication
          */
         isLoading() {
-            return !!__classPrivateFieldGet(this, _MedplumClient_profilePromise, "f");
+            return !!this.profilePromise;
         }
         /**
          * @category User Profile
          */
         getProfile() {
-            return __classPrivateFieldGet(this, _MedplumClient_profile, "f");
+            return this.profile;
         }
         /**
          * @category User Profile
          */
         async getProfileAsync() {
-            if (__classPrivateFieldGet(this, _MedplumClient_profilePromise, "f")) {
-                await __classPrivateFieldGet(this, _MedplumClient_profilePromise, "f");
+            if (this.profilePromise) {
+                await this.profilePromise;
             }
             return this.getProfile();
         }
@@ -7863,7 +7848,7 @@
          * @category User Profile
          */
         getUserConfiguration() {
-            return __classPrivateFieldGet(this, _MedplumClient_config, "f");
+            return this.config;
         }
         /**
          * Downloads the URL as a blob.
@@ -7873,13 +7858,234 @@
          * @returns Promise to the response body as a blob.
          */
         async download(url, options = {}) {
-            if (__classPrivateFieldGet(this, _MedplumClient_refreshPromise, "f")) {
-                await __classPrivateFieldGet(this, _MedplumClient_refreshPromise, "f");
+            if (this.refreshPromise) {
+                await this.refreshPromise;
             }
-            __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_addFetchOptionsDefaults).call(this, options);
-            const response = await __classPrivateFieldGet(this, _MedplumClient_fetch, "f").call(this, url.toString(), options);
+            this.addFetchOptionsDefaults(options);
+            const response = await this.fetch(url.toString(), options);
             return response.blob();
         }
+        //
+        // Private helpers
+        //
+        /**
+         * Returns the cache entry if available and not expired.
+         * @param key The cache key to retrieve.
+         * @param options Optional fetch options for cache settings.
+         * @returns The cached entry if found.
+         */
+        getCacheEntry(key, options) {
+            if (!this.requestCache || options?.cache === 'no-cache' || options?.cache === 'reload') {
+                return undefined;
+            }
+            const entry = this.requestCache.get(key);
+            if (!entry || entry.requestTime + this.cacheTime < Date.now()) {
+                return undefined;
+            }
+            return entry;
+        }
+        /**
+         * Adds a readable promise to the cache.
+         * @param key The cache key to store.
+         * @param value The readable promise to store.
+         */
+        setCacheEntry(key, value) {
+            if (this.requestCache) {
+                this.requestCache.set(key, { requestTime: Date.now(), value });
+            }
+        }
+        /**
+         * Adds a concrete value as the cache entry for the given resource.
+         * This is used in cases where the resource is loaded indirectly.
+         * For example, when a resource is loaded as part of a Bundle.
+         * @param resource The resource to cache.
+         */
+        cacheResource(resource) {
+            if (resource?.id) {
+                this.setCacheEntry(this.fhirUrl(resource.resourceType, resource.id).toString(), new ReadablePromise(Promise.resolve(resource)));
+            }
+        }
+        /**
+         * Deletes a cache entry.
+         * @param key The cache key to delete.
+         */
+        deleteCacheEntry(key) {
+            if (this.requestCache) {
+                this.requestCache.delete(key);
+            }
+        }
+        /**
+         * Makes an HTTP request.
+         * @param {string} method
+         * @param {string} url
+         * @param {string=} contentType
+         * @param {Object=} body
+         */
+        async request(method, url, options = {}) {
+            if (this.refreshPromise) {
+                await this.refreshPromise;
+            }
+            if (!url.startsWith('http')) {
+                url = this.baseUrl + url;
+            }
+            options.method = method;
+            this.addFetchOptionsDefaults(options);
+            const response = await this.fetchWithRetry(url, options);
+            if (response.status === 401) {
+                // Refresh and try again
+                return this.handleUnauthenticated(method, url, options);
+            }
+            if (response.status === 204 || response.status === 304) {
+                // No content or change
+                return undefined;
+            }
+            let obj = undefined;
+            try {
+                obj = await response.json();
+            }
+            catch (err) {
+                console.error('Error parsing response', response.status, err);
+                throw err;
+            }
+            if (response.status >= 400) {
+                throw new OperationOutcomeError(normalizeOperationOutcome(obj));
+            }
+            return obj;
+        }
+        async fetchWithRetry(url, options) {
+            const maxRetries = 3;
+            const retryDelay = 200;
+            let response = undefined;
+            for (let retry = 0; retry < maxRetries; retry++) {
+                response = (await this.fetch(url, options));
+                if (response.status < 500) {
+                    return response;
+                }
+                await new Promise((resolve) => setTimeout(resolve, retryDelay));
+            }
+            return response;
+        }
+        /**
+         * Executes a batch of requests that were automatically batched together.
+         */
+        async executeAutoBatch() {
+            // Get the current queue
+            const entries = [...this.autoBatchQueue];
+            // Clear the queue
+            this.autoBatchQueue.length = 0;
+            // Clear the timer
+            this.autoBatchTimerId = undefined;
+            // If there is only one request in the batch, just execute it
+            if (entries.length === 1) {
+                const entry = entries[0];
+                try {
+                    entry.resolve(await this.request(entry.method, this.fhirBaseUrl + entry.url, entry.options));
+                }
+                catch (err) {
+                    entry.reject(new OperationOutcomeError(normalizeOperationOutcome(err)));
+                }
+                return;
+            }
+            // Build the batch request
+            const batch = {
+                resourceType: 'Bundle',
+                type: 'batch',
+                entry: entries.map((e) => ({
+                    request: {
+                        method: e.method,
+                        url: e.url,
+                    },
+                    resource: e.options.body ? JSON.parse(e.options.body) : undefined,
+                })),
+            };
+            // Execute the batch request
+            const response = (await this.post('fhir/R4', batch));
+            // Process the response
+            for (let i = 0; i < entries.length; i++) {
+                const entry = entries[i];
+                const responseEntry = response.entry?.[i];
+                if (responseEntry?.response?.outcome && !isOk(responseEntry.response.outcome)) {
+                    entry.reject(new OperationOutcomeError(responseEntry.response.outcome));
+                }
+                else {
+                    entry.resolve(responseEntry?.resource);
+                }
+            }
+        }
+        /**
+         * Adds default options to the fetch options.
+         * @param options The options to add defaults to.
+         */
+        addFetchOptionsDefaults(options) {
+            let headers = options.headers;
+            if (!headers) {
+                headers = {};
+                options.headers = headers;
+            }
+            headers['X-Medplum'] = 'extended';
+            if (options.body && !headers['Content-Type']) {
+                headers['Content-Type'] = FHIR_CONTENT_TYPE;
+            }
+            if (this.accessToken) {
+                headers['Authorization'] = 'Bearer ' + this.accessToken;
+            }
+            if (this.basicAuth) {
+                headers['Authorization'] = 'Basic ' + this.basicAuth;
+            }
+            if (!options.cache) {
+                options.cache = 'no-cache';
+            }
+            if (!options.credentials) {
+                options.credentials = 'include';
+            }
+        }
+        /**
+         * Sets the "Content-Type" header on fetch options.
+         * @param options The fetch options.
+         * @param contentType The new content type to set.
+         */
+        setRequestContentType(options, contentType) {
+            if (!options.headers) {
+                options.headers = {};
+            }
+            const headers = options.headers;
+            headers['Content-Type'] = contentType;
+        }
+        /**
+         * Sets the body on fetch options.
+         * @param options The fetch options.
+         * @param data The new content body.
+         */
+        setRequestBody(options, data) {
+            if (typeof data === 'string' ||
+                (typeof Blob !== 'undefined' && data instanceof Blob) ||
+                (typeof File !== 'undefined' && data instanceof File) ||
+                (typeof Uint8Array !== 'undefined' && data instanceof Uint8Array)) {
+                options.body = data;
+            }
+            else if (data) {
+                options.body = JSON.stringify(data);
+            }
+        }
+        /**
+         * Handles an unauthenticated response from the server.
+         * First, tries to refresh the access token and retry the request.
+         * Otherwise, calls unauthenticated callbacks and rejects.
+         * @param method The HTTP method of the original request.
+         * @param url The URL of the original request.
+         * @param contentType The content type of the original request.
+         * @param body The body of the original request.
+         */
+        handleUnauthenticated(method, url, options) {
+            if (this.refresh()) {
+                return this.request(method, url, options);
+            }
+            this.clearActiveLogin();
+            if (this.onUnauthenticated) {
+                this.onUnauthenticated();
+            }
+            return Promise.reject(new Error('Unauthenticated'));
+        }
         /**
          * Starts a new PKCE flow.
          * These PKCE values are stateful, and must survive redirects and page refreshes.
@@ -7895,6 +8101,23 @@
             sessionStorage.setItem('codeChallenge', codeChallenge);
             return { codeChallengeMethod: 'S256', codeChallenge };
         }
+        /**
+         * 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 requestAuthorization(loginParams) {
+            const loginRequest = await this.ensureCodeChallenge(loginParams || {});
+            const url = new URL(this.authorizeUrl);
+            url.searchParams.set('response_type', 'code');
+            url.searchParams.set('state', sessionStorage.getItem('pkceState'));
+            url.searchParams.set('client_id', loginRequest.clientId || this.clientId);
+            url.searchParams.set('redirect_uri', loginRequest.redirectUri || getWindowOrigin());
+            url.searchParams.set('code_challenge_method', loginRequest.codeChallengeMethod);
+            url.searchParams.set('code_challenge', loginRequest.codeChallenge);
+            url.searchParams.set('scope', loginRequest.scope || 'openid profile');
+            window.location.assign(url.toString());
+        }
         /**
          * Processes an OAuth authorization code.
          * See: https://openid.net/specs/openid-connect-core-1_0.html#TokenRequest
@@ -7906,7 +8129,7 @@
             const formBody = new URLSearchParams();
             formBody.set('grant_type', 'authorization_code');
             formBody.set('code', code);
-            formBody.set('client_id', loginParams?.clientId || __classPrivateFieldGet(this, _MedplumClient_clientId, "f"));
+            formBody.set('client_id', loginParams?.clientId || this.clientId);
             formBody.set('redirect_uri', loginParams?.redirectUri || getWindowOrigin());
             if (typeof sessionStorage !== 'undefined') {
                 const codeVerifier = sessionStorage.getItem('codeVerifier');
@@ -7914,7 +8137,29 @@
                     formBody.set('code_verifier', codeVerifier);
                 }
             }
-            return __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_fetchTokens).call(this, formBody);
+            return this.fetchTokens(formBody);
+        }
+        /**
+         * Tries to refresh the auth tokens.
+         * See: https://openid.net/specs/openid-connect-core-1_0.html#RefreshTokens
+         */
+        refresh() {
+            if (this.refreshPromise) {
+                return this.refreshPromise;
+            }
+            if (this.refreshToken) {
+                const formBody = new URLSearchParams();
+                formBody.set('grant_type', 'refresh_token');
+                formBody.set('client_id', this.clientId);
+                formBody.set('refresh_token', this.refreshToken);
+                this.refreshPromise = this.fetchTokens(formBody);
+                return this.refreshPromise;
+            }
+            if (this.clientId && this.clientSecret) {
+                this.refreshPromise = this.startClientLogin(this.clientId, this.clientSecret);
+                return this.refreshPromise;
+            }
+            return undefined;
         }
         /**
          * Starts a new OAuth2 client credentials flow.
@@ -7925,13 +8170,24 @@
          * @returns Promise that resolves to the client profile.
          */
         async startClientLogin(clientId, clientSecret) {
-            __classPrivateFieldSet(this, _MedplumClient_clientId, clientId, "f");
-            __classPrivateFieldSet(this, _MedplumClient_clientSecret, clientSecret, "f");
+            this.clientId = clientId;
+            this.clientSecret = clientSecret;
             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);
+            return this.fetchTokens(formBody);
+        }
+        /**
+         * Sets the client ID and secret for basic auth.
+         * @category Authentication
+         * @param clientId The client ID.
+         * @param clientSecret The client secret.
+         */
+        setBasicAuth(clientId, clientSecret) {
+            this.clientId = clientId;
+            this.clientSecret = clientSecret;
+            this.basicAuth = encodeBase64(clientId + ':' + clientSecret);
         }
         /**
          * Invite a user to a project.
@@ -7942,280 +8198,72 @@
         async invite(projectId, body) {
             return this.post('admin/projects/' + projectId + '/invite', body);
         }
-    }
-    _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_fhirBaseUrl = new WeakMap(), _MedplumClient_authorizeUrl = new WeakMap(), _MedplumClient_tokenUrl = new WeakMap(), _MedplumClient_logoutUrl = new WeakMap(), _MedplumClient_exchangeUrl = new WeakMap(), _MedplumClient_onUnauthenticated = new WeakMap(), _MedplumClient_autoBatchTime = new WeakMap(), _MedplumClient_autoBatchQueue = new WeakMap(), _MedplumClient_clientId = new WeakMap(), _MedplumClient_clientSecret = new WeakMap(), _MedplumClient_autoBatchTimerId = 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 = 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?.cache === 'no-cache' || options?.cache === 'reload') {
-            return undefined;
-        }
-        const entry = __classPrivateFieldGet(this, _MedplumClient_requestCache, "f").get(key);
-        if (!entry || entry.requestTime + __classPrivateFieldGet(this, _MedplumClient_cacheTime, "f") < Date.now()) {
-            return undefined;
-        }
-        return entry;
-    }, _MedplumClient_setCacheEntry = function _MedplumClient_setCacheEntry(key, value) {
-        if (__classPrivateFieldGet(this, _MedplumClient_cacheTime, "f") > 0) {
-            __classPrivateFieldGet(this, _MedplumClient_requestCache, "f").set(key, { requestTime: Date.now(), value });
-        }
-    }, _MedplumClient_cacheResource = function _MedplumClient_cacheResource(resource) {
-        if (resource?.id) {
-            __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_setCacheEntry).call(this, this.fhirUrl(resource.resourceType, resource.id).toString(), new ReadablePromise(Promise.resolve(resource)));
-        }
-    }, _MedplumClient_deleteCacheEntry = function _MedplumClient_deleteCacheEntry(key) {
-        if (__classPrivateFieldGet(this, _MedplumClient_cacheTime, "f") > 0) {
-            __classPrivateFieldGet(this, _MedplumClient_requestCache, "f").delete(key);
-        }
-    }, _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_instances, "m", _MedplumClient_fetchWithRetry).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);
+        /**
+         * 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 fetchTokens(formBody) {
+            const response = await this.fetch(this.tokenUrl, {
+                method: 'POST',
+                headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
+                body: formBody,
+                credentials: 'include',
+            });
+            if (!response.ok) {
+                this.clearActiveLogin();
+                throw new Error('Failed to fetch tokens');
+            }
+            const tokens = await response.json();
+            await this.verifyTokens(tokens);
+            return this.getProfile();
         }
-        if (response.status === 204 || response.status === 304) {
-            // No content or change
-            return undefined;
+        /**
+         * 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 verifyTokens(tokens) {
+            const token = tokens.access_token;
+            // Verify token has not expired
+            const tokenPayload = parseJWTPayload(token);
+            if (Date.now() >= tokenPayload.exp * 1000) {
+                this.clearActiveLogin();
+                throw new Error('Token expired');
+            }
+            // Verify app_client_id
+            if (this.clientId && tokenPayload.client_id !== this.clientId) {
+                this.clearActiveLogin();
+                throw new Error('Token was not issued for this audience');
+            }
+            return this.setActiveLogin({
+                accessToken: token,
+                refreshToken: tokens.refresh_token,
+                project: tokens.project,
+                profile: tokens.profile,
+            });
         }
-        let obj = undefined;
-        try {
-            obj = await response.json();
-        }
-        catch (err) {
-            console.error('Error parsing response', response.status, err);
-            throw err;
-        }
-        if (response.status >= 400) {
-            throw new OperationOutcomeError(normalizeOperationOutcome(obj));
-        }
-        return obj;
-    }, _MedplumClient_fetchWithRetry = async function _MedplumClient_fetchWithRetry(url, options) {
-        const maxRetries = 3;
-        const retryDelay = 200;
-        let response = undefined;
-        for (let retry = 0; retry < maxRetries; retry++) {
-            response = (await __classPrivateFieldGet(this, _MedplumClient_fetch, "f").call(this, url, options));
-            if (response.status < 500) {
-                return response;
-            }
-            await new Promise((resolve) => setTimeout(resolve, retryDelay));
-        }
-        return response;
-    }, _MedplumClient_executeAutoBatch = 
-    /**
-     * Executes a batch of requests that were automatically batched together.
-     */
-    async function _MedplumClient_executeAutoBatch() {
-        // Get the current queue
-        const entries = [...__classPrivateFieldGet(this, _MedplumClient_autoBatchQueue, "f")];
-        // Clear the queue
-        __classPrivateFieldGet(this, _MedplumClient_autoBatchQueue, "f").length = 0;
-        // Clear the timer
-        __classPrivateFieldSet(this, _MedplumClient_autoBatchTimerId, undefined, "f");
-        // If there is only one request in the batch, just execute it
-        if (entries.length === 1) {
-            const entry = entries[0];
+        /**
+         * Sets up a listener for window storage events.
+         * This synchronizes state across browser windows and browser tabs.
+         */
+        setupStorageListener() {
             try {
-                entry.resolve(await __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_request).call(this, entry.method, __classPrivateFieldGet(this, _MedplumClient_fhirBaseUrl, "f") + entry.url, entry.options));
+                window.addEventListener('storage', (e) => {
+                    if (e.key === null || e.key === 'activeLogin') {
+                        // Storage events fire when different tabs make changes.
+                        // On storage clear (key === null) or activeLogin change (key === 'activeLogin')
+                        // Refresh the page to ensure the active login is up to date.
+                        window.location.reload();
+                    }
+                });
             }
             catch (err) {
-                entry.reject(new OperationOutcomeError(normalizeOperationOutcome(err)));
+                // Silently ignore if this environment does not support storage events
             }
-            return;
         }
-        // Build the batch request
-        const batch = {
-            resourceType: 'Bundle',
-            type: 'batch',
-            entry: entries.map((e) => ({
-                request: {
-                    method: e.method,
-                    url: e.url,
-                },
-                resource: e.options.body ? JSON.parse(e.options.body) : undefined,
-            })),
-        };
-        // Execute the batch request
-        const response = (await this.post('fhir/R4', batch));
-        // Process the response
-        for (let i = 0; i < entries.length; i++) {
-            const entry = entries[i];
-            const responseEntry = response.entry?.[i];
-            if (responseEntry?.response?.outcome && !isOk(responseEntry.response.outcome)) {
-                entry.reject(new OperationOutcomeError(responseEntry.response.outcome));
-            }
-            else {
-                entry.resolve(responseEntry?.resource);
-            }
-        }
-    }, _MedplumClient_addFetchOptionsDefaults = function _MedplumClient_addFetchOptionsDefaults(options) {
-        if (!options.headers) {
-            options.headers = {};
-        }
-        const headers = options.headers;
-        headers['X-Medplum'] = 'extended';
-        if (!headers['Content-Type']) {
-            headers['Content-Type'] = FHIR_CONTENT_TYPE;
-        }
-        if (__classPrivateFieldGet(this, _MedplumClient_accessToken, "f")) {
-            headers['Authorization'] = 'Bearer ' + __classPrivateFieldGet(this, _MedplumClient_accessToken, "f");
-        }
-        if (!options.cache) {
-            options.cache = 'no-cache';
-        }
-        if (!options.credentials) {
-            options.credentials = 'include';
-        }
-    }, _MedplumClient_setRequestContentType = function _MedplumClient_setRequestContentType(options, contentType) {
-        if (!options.headers) {
-            options.headers = {};
-        }
-        const headers = options.headers;
-        headers['Content-Type'] = contentType;
-    }, _MedplumClient_setRequestBody = function _MedplumClient_setRequestBody(options, data) {
-        if (typeof data === 'string' ||
-            (typeof Blob !== 'undefined' && data instanceof Blob) ||
-            (typeof File !== 'undefined' && data instanceof File) ||
-            (typeof Uint8Array !== 'undefined' && data instanceof Uint8Array)) {
-            options.body = data;
-        }
-        else if (data) {
-            options.body = JSON.stringify(data);
-        }
-    }, _MedplumClient_handleUnauthenticated = function _MedplumClient_handleUnauthenticated(method, url, options) {
-        if (__classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_refresh).call(this)) {
-            return __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_request).call(this, method, url, options);
-        }
-        this.clearActiveLogin();
-        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(loginParams) {
-        const loginRequest = await this.ensureCodeChallenge(loginParams || {});
-        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', loginRequest.clientId || __classPrivateFieldGet(this, _MedplumClient_clientId, "f"));
-        url.searchParams.set('redirect_uri', loginRequest.redirectUri || getWindowOrigin());
-        url.searchParams.set('code_challenge_method', loginRequest.codeChallengeMethod);
-        url.searchParams.set('code_challenge', loginRequest.codeChallenge);
-        url.searchParams.set('scope', loginRequest.scope || 'openid profile');
-        window.location.assign(url.toString());
-    }, _MedplumClient_refresh = function _MedplumClient_refresh() {
-        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");
-            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) {
-        const response = await __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',
-        });
-        if (!response.ok) {
-            this.clearActiveLogin();
-            throw new Error('Failed to fetch tokens');
-        }
-        const tokens = await response.json();
-        await __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_verifyTokens).call(this, tokens);
-        return 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.clearActiveLogin();
-            throw new Error('Token expired');
-        }
-        // Verify app_client_id
-        if (__classPrivateFieldGet(this, _MedplumClient_clientId, "f") && tokenPayload.client_id !== __classPrivateFieldGet(this, _MedplumClient_clientId, "f")) {
-            this.clearActiveLogin();
-            throw new Error('Token was not issued for this audience');
-        }
-        return this.setActiveLogin({
-            accessToken: token,
-            refreshToken: tokens.refresh_token,
-            project: tokens.project,
-            profile: tokens.profile,
-        });
-    }, _MedplumClient_setupStorageListener = function _MedplumClient_setupStorageListener() {
-        try {
-            window.addEventListener('storage', (e) => {
-                if (e.key === null || e.key === 'activeLogin') {
-                    // Storage events fire when different tabs make changes.
-                    // On storage clear (key === null) or activeLogin change (key === 'activeLogin')
-                    // Refresh the page to ensure the active login is up to date.
-                    window.location.reload();
-                }
-            });
-        }
-        catch (err) {
-            // Silently ignore if this environment does not support storage events
-        }
-    };
+    }
     /**
      * Returns the default fetch method.
      * The default fetch is currently only available in browser environments.
@@ -8245,7 +8293,6 @@
         return url.endsWith('/') ? url : url + '/';
     }
 
-    var _ParserBuilder_prefixParselets, _ParserBuilder_infixParselets, _Parser_tokens, _Parser_prefixParselets, _Parser_infixParselets;
     class PrefixOperatorAtom {
         constructor(operator, child) {
             this.operator = operator;
@@ -8267,15 +8314,15 @@
     }
     class ParserBuilder {
         constructor() {
-            _ParserBuilder_prefixParselets.set(this, {});
-            _ParserBuilder_infixParselets.set(this, {});
+            this.prefixParselets = {};
+            this.infixParselets = {};
         }
         registerInfix(tokenType, parselet) {
-            __classPrivateFieldGet(this, _ParserBuilder_infixParselets, "f")[tokenType] = parselet;
+            this.infixParselets[tokenType] = parselet;
             return this;
         }
         registerPrefix(tokenType, parselet) {
-            __classPrivateFieldGet(this, _ParserBuilder_prefixParselets, "f")[tokenType] = parselet;
+            this.prefixParselets[tokenType] = parselet;
             return this;
         }
         prefix(tokenType, precedence, builder) {
@@ -8296,21 +8343,17 @@
             });
         }
         construct(input) {
-            return new Parser(input, __classPrivateFieldGet(this, _ParserBuilder_prefixParselets, "f"), __classPrivateFieldGet(this, _ParserBuilder_infixParselets, "f"));
+            return new Parser(input, this.prefixParselets, this.infixParselets);
         }
     }
-    _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");
+            this.tokens = tokens;
+            this.prefixParselets = prefixParselets;
+            this.infixParselets = infixParselets;
         }
         hasMore() {
-            return __classPrivateFieldGet(this, _Parser_tokens, "f").length > 0;
+            return this.tokens.length > 0;
         }
         match(expected) {
             const token = this.peek();
@@ -8322,7 +8365,7 @@
         }
         consumeAndParse(precedence = Infinity) {
             const token = this.consume();
-            const prefix = __classPrivateFieldGet(this, _Parser_prefixParselets, "f")[token.id];
+            const prefix = this.prefixParselets[token.id];
             if (!prefix) {
                 throw Error(`Parse error at "${token.value}" (line ${token.line}, column ${token.column}). No matching prefix parselet.`);
             }
@@ -8346,7 +8389,7 @@
             return Infinity;
         }
         consume(expectedId, expectedValue) {
-            if (!__classPrivateFieldGet(this, _Parser_tokens, "f").length) {
+            if (!this.tokens.length) {
                 throw Error('Cant consume unknown more tokens.');
             }
             if (expectedId && this.peek()?.id !== expectedId) {
@@ -8357,21 +8400,19 @@
                 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();
+            return this.tokens.shift();
         }
         peek() {
-            return __classPrivateFieldGet(this, _Parser_tokens, "f").length > 0 ? __classPrivateFieldGet(this, _Parser_tokens, "f")[0] : undefined;
+            return this.tokens.length > 0 ? this.tokens[0] : undefined;
         }
         removeComments() {
-            __classPrivateFieldSet(this, _Parser_tokens, __classPrivateFieldGet(this, _Parser_tokens, "f").filter((t) => t.id !== 'Comment'), "f");
+            this.tokens = this.tokens.filter((t) => t.id !== 'Comment');
         }
         getInfixParselet(token) {
-            return __classPrivateFieldGet(this, _Parser_infixParselets, "f")[token.id === 'Symbol' ? token.value : token.id];
+            return this.infixParselets[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_dateTimeLiterals, _Tokenizer_symbolRegex, _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',
@@ -8392,190 +8433,203 @@
     ];
     class Tokenizer {
         constructor(str, keywords, operators, options) {
-            _Tokenizer_instances.add(this);
-            _Tokenizer_str.set(this, void 0);
-            _Tokenizer_keywords.set(this, void 0);
-            _Tokenizer_operators.set(this, void 0);
-            _Tokenizer_dateTimeLiterals.set(this, void 0);
-            _Tokenizer_symbolRegex.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");
-            __classPrivateFieldSet(this, _Tokenizer_dateTimeLiterals, !!options?.dateTimeLiterals, "f");
-            __classPrivateFieldSet(this, _Tokenizer_symbolRegex, options?.symbolRegex ?? /[$\w]/, "f");
+            this.result = [];
+            this.pos = { index: 0, line: 1, column: 0 };
+            this.markStack = [];
+            this.str = str;
+            this.keywords = keywords;
+            this.operators = operators;
+            this.dateTimeLiterals = !!options?.dateTimeLiterals;
+            this.symbolRegex = options?.symbolRegex ?? /[$\w]/;
         }
         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);
+            while (this.pos.index < this.str.length) {
+                const token = this.consumeToken();
                 if (token) {
-                    __classPrivateFieldGet(this, _Tokenizer_result, "f").push(token);
+                    this.result.push(token);
                 }
             }
-            return __classPrivateFieldGet(this, _Tokenizer_result, "f");
+            return this.result;
         }
-    }
-    _Tokenizer_str = new WeakMap(), _Tokenizer_keywords = new WeakMap(), _Tokenizer_operators = new WeakMap(), _Tokenizer_dateTimeLiterals = new WeakMap(), _Tokenizer_symbolRegex = 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;
+        prevToken() {
+            return this.result.slice(-1)[0];
         }
-        __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) === '-' && __classPrivateFieldGet(this, _Tokenizer_dateTimeLiterals, "f")) {
-            // Rewind to one character before the start, and then treat as dateTime literal.
-            __classPrivateFieldGet(this, _Tokenizer_pos, "f").index = start - 1;
-            return __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeDateTime).call(this);
-        }
-        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(__classPrivateFieldGet(this, _Tokenizer_symbolRegex, "f")));
-        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;
+        peekToken() {
+            this.mark();
+            const token = this.consumeToken();
+            this.reset();
+            return token;
         }
-        else {
-            __classPrivateFieldGet(this, _Tokenizer_pos, "f").column++;
+        consumeToken() {
+            this.consumeWhitespace();
+            const c = this.curr();
+            if (!c) {
+                return undefined;
+            }
+            this.mark();
+            const next = this.peek();
+            if (c === '/' && next === '*') {
+                return this.consumeMultiLineComment();
+            }
+            if (c === '/' && next === '/') {
+                return this.consumeSingleLineComment();
+            }
+            if (c === "'" || c === '"') {
+                return this.consumeString(c);
+            }
+            if (c === '`') {
+                return this.consumeBacktickSymbol();
+            }
+            if (c === '@') {
+                return this.consumeDateTime();
+            }
+            if (c.match(/\d/)) {
+                return this.consumeNumber();
+            }
+            if (c.match(/\w/)) {
+                return this.consumeSymbol();
+            }
+            if (c === '$' && next.match(/\w/)) {
+                return this.consumeSymbol();
+            }
+            return this.consumeOperator();
         }
-    }, _Tokenizer_buildToken = function _Tokenizer_buildToken(id, value) {
-        const mark = __classPrivateFieldGet(this, _Tokenizer_markStack, "f").pop();
-        if (!mark) {
-            throw new Error('No mark for token');
+        consumeWhitespace() {
+            this.consumeWhile(() => this.curr().match(/\s/));
         }
-        return {
-            id,
-            value,
-            ...mark,
-        };
-    };
+        consumeMultiLineComment() {
+            const start = this.pos.index;
+            this.consumeWhile(() => this.curr() !== '*' || this.peek() !== '/');
+            this.advance();
+            this.advance();
+            return this.buildToken('Comment', this.str.substring(start, this.pos.index));
+        }
+        consumeSingleLineComment() {
+            return this.buildToken('Comment', this.consumeWhile(() => this.curr() !== '\n'));
+        }
+        consumeString(endChar) {
+            this.advance();
+            const result = this.buildToken('String', this.consumeWhile(() => this.prev() === '\\' || this.curr() !== endChar));
+            this.advance();
+            return result;
+        }
+        consumeBacktickSymbol() {
+            this.advance();
+            const result = this.buildToken('Symbol', this.consumeWhile(() => this.curr() !== '`'));
+            this.advance();
+            return result;
+        }
+        consumeDateTime() {
+            this.advance(); // Consume "@"
+            const start = this.pos.index;
+            this.consumeWhile(() => this.curr().match(/[\d-]/));
+            if (this.curr() === 'T') {
+                this.advance();
+                this.consumeWhile(() => this.curr().match(/[\d:]/));
+                if (this.curr() === '.' && this.peek().match(/\d/)) {
+                    this.advance();
+                    this.consumeWhile(() => this.curr().match(/\d/));
+                }
+                if (this.curr() === 'Z') {
+                    this.advance();
+                }
+                else if (this.curr() === '+' || this.curr() === '-') {
+                    this.advance();
+                    this.consumeWhile(() => this.curr().match(/[\d:]/));
+                }
+            }
+            return this.buildToken('DateTime', this.str.substring(start, this.pos.index));
+        }
+        consumeNumber() {
+            const start = this.pos.index;
+            let id = 'Number';
+            this.consumeWhile(() => this.curr().match(/\d/));
+            if (this.curr() === '.' && this.peek().match(/\d/)) {
+                this.advance();
+                this.consumeWhile(() => this.curr().match(/\d/));
+            }
+            if (this.curr() === '-' && this.dateTimeLiterals) {
+                // Rewind to one character before the start, and then treat as dateTime literal.
+                this.pos.index = start - 1;
+                return this.consumeDateTime();
+            }
+            if (this.curr() === ' ') {
+                if (isUnitToken(this.peekToken())) {
+                    id = 'Quantity';
+                    this.consumeToken();
+                }
+            }
+            return this.buildToken(id, this.str.substring(start, this.pos.index));
+        }
+        consumeSymbol() {
+            const value = this.consumeWhile(() => this.curr().match(this.symbolRegex));
+            if (this.prevToken()?.value !== '.' && this.keywords.includes(value)) {
+                return this.buildToken(value, value);
+            }
+            return this.buildToken('Symbol', value);
+        }
+        consumeOperator() {
+            const c = this.curr();
+            const next = this.peek();
+            const twoCharOp = c + next;
+            if (this.operators.includes(twoCharOp)) {
+                this.advance();
+                this.advance();
+                return this.buildToken(twoCharOp, twoCharOp);
+            }
+            this.advance();
+            return this.buildToken(c, c);
+        }
+        consumeWhile(condition) {
+            const start = this.pos.index;
+            while (this.pos.index < this.str.length && condition()) {
+                this.advance();
+            }
+            return this.str.substring(start, this.pos.index);
+        }
+        curr() {
+            return this.str[this.pos.index];
+        }
+        prev() {
+            return this.str[this.pos.index - 1] ?? '';
+        }
+        peek() {
+            return this.str[this.pos.index + 1] ?? '';
+        }
+        mark() {
+            this.markStack.push({ ...this.pos });
+        }
+        reset() {
+            const mark = this.markStack.pop();
+            if (!mark) {
+                throw new Error('No mark to reset to');
+            }
+            this.pos.index = mark.index;
+            this.pos.line = mark.line;
+            this.pos.column = mark.column;
+        }
+        advance() {
+            this.pos.index++;
+            if (this.curr() === '\n') {
+                this.pos.line++;
+                this.pos.column = 0;
+            }
+            else {
+                this.pos.column++;
+            }
+        }
+        buildToken(id, value) {
+            const mark = this.markStack.pop();
+            if (!mark) {
+                throw new Error('No mark for token');
+            }
+            return {
+                id,
+                value,
+                ...mark,
+            };
+        }
+    }
     function isUnitToken(token) {
         if (token) {
             if (token.id === 'String') {
@@ -10960,10 +11014,8 @@
         return new Tokenizer(str, FHIRPATH_KEYWORDS, MAPPING_LANGUAGE_OPERATORS$1).tokenize();
     }
 
-    var _StructureMapParser_instances, _StructureMapParser_parseUses, _StructureMapParser_parseImport, _StructureMapParser_parseGroup, _StructureMapParser_parseParameters, _StructureMapParser_parseParameter, _StructureMapParser_parseRules, _StructureMapParser_parseRule, _StructureMapParser_parseRuleSources, _StructureMapParser_parseRuleSource, _StructureMapParser_parseRuleTargets, _StructureMapParser_parseRuleTarget, _StructureMapParser_parseRuleTargetTransform, _StructureMapParser_parseRuleTargetSymbol, _StructureMapParser_parseRuleTargetFunction, _StructureMapParser_parseRuleTargetLiteral, _StructureMapParser_parseRuleContext, _StructureMapParser_parseRuleDependents, _StructureMapParser_parseConceptMap;
     class StructureMapParser {
         constructor(parser) {
-            _StructureMapParser_instances.add(this);
             this.parser = parser;
             this.structureMap = { resourceType: 'StructureMap' };
         }
@@ -10978,16 +11030,16 @@
                 const next = this.parser.peek()?.value;
                 switch (next) {
                     case 'uses':
-                        __classPrivateFieldGet(this, _StructureMapParser_instances, "m", _StructureMapParser_parseUses).call(this);
+                        this.parseUses();
                         break;
                     case 'imports':
-                        __classPrivateFieldGet(this, _StructureMapParser_instances, "m", _StructureMapParser_parseImport).call(this);
+                        this.parseImport();
                         break;
                     case 'group':
-                        __classPrivateFieldGet(this, _StructureMapParser_instances, "m", _StructureMapParser_parseGroup).call(this);
+                        this.parseGroup();
                         break;
                     case 'conceptmap':
-                        __classPrivateFieldGet(this, _StructureMapParser_instances, "m", _StructureMapParser_parseConceptMap).call(this);
+                        this.parseConceptMap();
                         break;
                     default:
                         throw new Error(`Unexpected token: ${next}`);
@@ -10995,263 +11047,280 @@
             }
             return this.structureMap;
         }
-    }
-    _StructureMapParser_instances = new WeakSet(), _StructureMapParser_parseUses = function _StructureMapParser_parseUses() {
-        // 'uses' url structureAlias? 'as' modelMode
-        // uses "http://hl7.org/fhir/StructureDefinition/tutorial-left" as source
-        this.parser.consume('Symbol', 'uses');
-        const result = {};
-        result.url = this.parser.consume('String').value;
-        if (this.parser.peek()?.value === 'alias') {
-            this.parser.consume('Symbol', 'alias');
-            result.alias = this.parser.consume('Symbol').value;
-        }
-        this.parser.consume('Symbol', 'as');
-        result.mode = this.parser.consume().value;
-        if (!this.structureMap.structure) {
-            this.structureMap.structure = [];
-        }
-        this.structureMap.structure.push(result);
-    }, _StructureMapParser_parseImport = function _StructureMapParser_parseImport() {
-        this.parser.consume('Symbol', 'imports');
-        if (!this.structureMap.import) {
-            this.structureMap.import = [];
-        }
-        this.structureMap.import.push(this.parser.consume('String').value);
-    }, _StructureMapParser_parseGroup = function _StructureMapParser_parseGroup() {
-        // 'group' identifier parameters extends? typeMode? rules
-        // group tutorial(source src : TLeft, target tgt : TRight) {
-        const result = {};
-        this.parser.consume('Symbol', 'group');
-        result.name = this.parser.consume('Symbol').value;
-        result.input = __classPrivateFieldGet(this, _StructureMapParser_instances, "m", _StructureMapParser_parseParameters).call(this);
-        if (this.parser.peek()?.value === 'extends') {
-            this.parser.consume('Symbol', 'extends');
-            result.extends = this.parser.consume('Symbol').value;
-        }
-        if (this.parser.peek()?.value === '<<') {
-            this.parser.consume('<<');
-            result.typeMode = this.parser.consume().value;
-            if (this.parser.peek()?.value === '+') {
-                this.parser.consume('+');
-                result.typeMode = 'type-and-types';
-            }
-            this.parser.consume('>>');
-        }
-        else {
-            result.typeMode = 'none';
-        }
-        result.rule = __classPrivateFieldGet(this, _StructureMapParser_instances, "m", _StructureMapParser_parseRules).call(this);
-        if (!this.structureMap.group) {
-            this.structureMap.group = [];
-        }
-        this.structureMap.group.push(result);
-    }, _StructureMapParser_parseParameters = function _StructureMapParser_parseParameters() {
-        const parameters = [];
-        this.parser.consume('(');
-        while (this.parser.hasMore() && this.parser.peek()?.value !== ')') {
-            parameters.push(__classPrivateFieldGet(this, _StructureMapParser_instances, "m", _StructureMapParser_parseParameter).call(this));
-            if (this.parser.peek()?.value === ',') {
-                this.parser.consume(',');
+        parseUses() {
+            // 'uses' url structureAlias? 'as' modelMode
+            // uses "http://hl7.org/fhir/StructureDefinition/tutorial-left" as source
+            this.parser.consume('Symbol', 'uses');
+            const result = {};
+            result.url = this.parser.consume('String').value;
+            if (this.parser.peek()?.value === 'alias') {
+                this.parser.consume('Symbol', 'alias');
+                result.alias = this.parser.consume('Symbol').value;
             }
-        }
-        this.parser.consume(')');
-        return parameters;
-    }, _StructureMapParser_parseParameter = function _StructureMapParser_parseParameter() {
-        // inputMode identifier type?
-        // ':' identifier
-        // source src : TLeft
-        const result = {};
-        result.mode = this.parser.consume().value;
-        result.name = this.parser.consume('Symbol').value;
-        if (this.parser.peek()?.value === ':') {
-            this.parser.consume(':');
-            result.type = this.parser.consume('Symbol').value;
-        }
-        return result;
-    }, _StructureMapParser_parseRules = function _StructureMapParser_parseRules() {
-        const rules = [];
-        this.parser.consume('{');
-        while (this.parser.hasMore() && this.parser.peek()?.value !== '}') {
-            rules.push(__classPrivateFieldGet(this, _StructureMapParser_instances, "m", _StructureMapParser_parseRule).call(this));
-        }
-        this.parser.consume('}');
-        return rules;
-    }, _StructureMapParser_parseRule = function _StructureMapParser_parseRule() {
-        const result = {
-            source: __classPrivateFieldGet(this, _StructureMapParser_instances, "m", _StructureMapParser_parseRuleSources).call(this),
-        };
-        if (this.parser.peek()?.value === '->') {
-            this.parser.consume('->');
-            result.target = __classPrivateFieldGet(this, _StructureMapParser_instances, "m", _StructureMapParser_parseRuleTargets).call(this);
-        }
-        if (this.parser.peek()?.value === 'then') {
-            this.parser.consume('Symbol', 'then');
-            if (this.parser.peek()?.id === '{') {
-                result.rule = __classPrivateFieldGet(this, _StructureMapParser_instances, "m", _StructureMapParser_parseRules).call(this);
+            this.parser.consume('Symbol', 'as');
+            result.mode = this.parser.consume().value;
+            if (!this.structureMap.structure) {
+                this.structureMap.structure = [];
+            }
+            this.structureMap.structure.push(result);
+        }
+        parseImport() {
+            this.parser.consume('Symbol', 'imports');
+            if (!this.structureMap.import) {
+                this.structureMap.import = [];
+            }
+            this.structureMap.import.push(this.parser.consume('String').value);
+        }
+        parseGroup() {
+            // 'group' identifier parameters extends? typeMode? rules
+            // group tutorial(source src : TLeft, target tgt : TRight) {
+            const result = {};
+            this.parser.consume('Symbol', 'group');
+            result.name = this.parser.consume('Symbol').value;
+            result.input = this.parseParameters();
+            if (this.parser.peek()?.value === 'extends') {
+                this.parser.consume('Symbol', 'extends');
+                result.extends = this.parser.consume('Symbol').value;
+            }
+            if (this.parser.peek()?.value === '<<') {
+                this.parser.consume('<<');
+                result.typeMode = this.parser.consume().value;
+                if (this.parser.peek()?.value === '+') {
+                    this.parser.consume('+');
+                    result.typeMode = 'type-and-types';
+                }
+                this.parser.consume('>>');
             }
             else {
-                result.dependent = __classPrivateFieldGet(this, _StructureMapParser_instances, "m", _StructureMapParser_parseRuleDependents).call(this);
+                result.typeMode = 'none';
             }
+            result.rule = this.parseRules();
+            if (!this.structureMap.group) {
+                this.structureMap.group = [];
+            }
+            this.structureMap.group.push(result);
         }
-        if (this.parser.peek()?.id === 'String') {
-            result.name = this.parser.consume().value;
-        }
-        else {
-            result.name = result.source?.[0]?.element;
-        }
-        this.parser.consume(';');
-        return result;
-    }, _StructureMapParser_parseRuleSources = function _StructureMapParser_parseRuleSources() {
-        const sources = [__classPrivateFieldGet(this, _StructureMapParser_instances, "m", _StructureMapParser_parseRuleSource).call(this)];
-        while (this.parser.hasMore() && this.parser.peek()?.value === ',') {
-            this.parser.consume(',');
-            sources.push(__classPrivateFieldGet(this, _StructureMapParser_instances, "m", _StructureMapParser_parseRuleSource).call(this));
-        }
-        return sources;
-    }, _StructureMapParser_parseRuleSource = function _StructureMapParser_parseRuleSource() {
-        const result = {};
-        const context = __classPrivateFieldGet(this, _StructureMapParser_instances, "m", _StructureMapParser_parseRuleContext).call(this);
-        if (context.includes('.')) {
-            const parts = context.split('.');
-            result.context = parts[0];
-            result.element = parts[1];
-        }
-        else {
-            result.context = context;
-        }
-        if (this.parser.hasMore() && this.parser.peek()?.value === ':') {
-            this.parser.consume(':');
-            result.type = this.parser.consume().value;
-        }
-        if (this.parser.hasMore() && this.parser.peek()?.value === 'default') {
-            this.parser.consume('default');
-            this.parser.consumeAndParse();
-        }
-        if (this.parser.peek()?.value === 'first' ||
-            this.parser.peek()?.value === 'not_first' ||
-            this.parser.peek()?.value === 'last' ||
-            this.parser.peek()?.value === 'not_last' ||
-            this.parser.peek()?.value === 'only_one') {
-            result.listMode = this.parser.consume().value;
+        parseParameters() {
+            const parameters = [];
+            this.parser.consume('(');
+            while (this.parser.hasMore() && this.parser.peek()?.value !== ')') {
+                parameters.push(this.parseParameter());
+                if (this.parser.peek()?.value === ',') {
+                    this.parser.consume(',');
+                }
+            }
+            this.parser.consume(')');
+            return parameters;
         }
-        if (this.parser.peek()?.value === 'as') {
-            this.parser.consume('Symbol', 'as');
-            result.variable = this.parser.consume().value;
+        parseParameter() {
+            // inputMode identifier type?
+            // ':' identifier
+            // source src : TLeft
+            const result = {};
+            result.mode = this.parser.consume().value;
+            result.name = this.parser.consume('Symbol').value;
+            if (this.parser.peek()?.value === ':') {
+                this.parser.consume(':');
+                result.type = this.parser.consume('Symbol').value;
+            }
+            return result;
         }
-        if (this.parser.peek()?.value === 'where') {
-            this.parser.consume('Symbol', 'where');
-            const whereFhirPath = this.parser.consumeAndParse(100 /* OperatorPrecedence.Arrow */);
-            result.condition = whereFhirPath.toString();
+        parseRules() {
+            const rules = [];
+            this.parser.consume('{');
+            while (this.parser.hasMore() && this.parser.peek()?.value !== '}') {
+                rules.push(this.parseRule());
+            }
+            this.parser.consume('}');
+            return rules;
+        }
+        parseRule() {
+            const result = {
+                source: this.parseRuleSources(),
+            };
+            if (this.parser.peek()?.value === '->') {
+                this.parser.consume('->');
+                result.target = this.parseRuleTargets();
+            }
+            if (this.parser.peek()?.value === 'then') {
+                this.parser.consume('Symbol', 'then');
+                if (this.parser.peek()?.id === '{') {
+                    result.rule = this.parseRules();
+                }
+                else {
+                    result.dependent = this.parseRuleDependents();
+                }
+            }
+            if (this.parser.peek()?.id === 'String') {
+                result.name = this.parser.consume().value;
+            }
+            else {
+                result.name = result.source?.[0]?.element;
+            }
+            this.parser.consume(';');
+            return result;
         }
-        if (this.parser.peek()?.value === 'check') {
-            this.parser.consume('Symbol', 'check');
-            const checkFhirPath = this.parser.consumeAndParse(100 /* OperatorPrecedence.Arrow */);
-            result.check = checkFhirPath.toString();
+        parseRuleSources() {
+            const sources = [this.parseRuleSource()];
+            while (this.parser.hasMore() && this.parser.peek()?.value === ',') {
+                this.parser.consume(',');
+                sources.push(this.parseRuleSource());
+            }
+            return sources;
         }
-        return result;
-    }, _StructureMapParser_parseRuleTargets = function _StructureMapParser_parseRuleTargets() {
-        const targets = [__classPrivateFieldGet(this, _StructureMapParser_instances, "m", _StructureMapParser_parseRuleTarget).call(this)];
-        while (this.parser.hasMore() && this.parser.peek()?.value === ',') {
-            this.parser.consume(',');
-            targets.push(__classPrivateFieldGet(this, _StructureMapParser_instances, "m", _StructureMapParser_parseRuleTarget).call(this));
-        }
-        return targets;
-    }, _StructureMapParser_parseRuleTarget = function _StructureMapParser_parseRuleTarget() {
-        const result = {};
-        const context = __classPrivateFieldGet(this, _StructureMapParser_instances, "m", _StructureMapParser_parseRuleContext).call(this);
-        if (context.includes('.')) {
-            const parts = context.split('.');
-            result.contextType = 'variable';
-            result.context = parts[0];
-            result.element = parts[1];
+        parseRuleSource() {
+            const result = {};
+            const context = this.parseRuleContext();
+            if (context.includes('.')) {
+                const parts = context.split('.');
+                result.context = parts[0];
+                result.element = parts[1];
+            }
+            else {
+                result.context = context;
+            }
+            if (this.parser.hasMore() && this.parser.peek()?.value === ':') {
+                this.parser.consume(':');
+                result.type = this.parser.consume().value;
+            }
+            if (this.parser.hasMore() && this.parser.peek()?.value === 'default') {
+                this.parser.consume('default');
+                this.parser.consumeAndParse();
+            }
+            if (this.parser.peek()?.value === 'first' ||
+                this.parser.peek()?.value === 'not_first' ||
+                this.parser.peek()?.value === 'last' ||
+                this.parser.peek()?.value === 'not_last' ||
+                this.parser.peek()?.value === 'only_one') {
+                result.listMode = this.parser.consume().value;
+            }
+            if (this.parser.peek()?.value === 'as') {
+                this.parser.consume('Symbol', 'as');
+                result.variable = this.parser.consume().value;
+            }
+            if (this.parser.peek()?.value === 'where') {
+                this.parser.consume('Symbol', 'where');
+                const whereFhirPath = this.parser.consumeAndParse(100 /* OperatorPrecedence.Arrow */);
+                result.condition = whereFhirPath.toString();
+            }
+            if (this.parser.peek()?.value === 'check') {
+                this.parser.consume('Symbol', 'check');
+                const checkFhirPath = this.parser.consumeAndParse(100 /* OperatorPrecedence.Arrow */);
+                result.check = checkFhirPath.toString();
+            }
+            return result;
         }
-        else {
-            result.context = context;
+        parseRuleTargets() {
+            const targets = [this.parseRuleTarget()];
+            while (this.parser.hasMore() && this.parser.peek()?.value === ',') {
+                this.parser.consume(',');
+                targets.push(this.parseRuleTarget());
+            }
+            return targets;
         }
-        if (this.parser.peek()?.value === '=') {
-            this.parser.consume('=');
-            __classPrivateFieldGet(this, _StructureMapParser_instances, "m", _StructureMapParser_parseRuleTargetTransform).call(this, result);
+        parseRuleTarget() {
+            const result = {};
+            const context = this.parseRuleContext();
+            if (context.includes('.')) {
+                const parts = context.split('.');
+                result.contextType = 'variable';
+                result.context = parts[0];
+                result.element = parts[1];
+            }
+            else {
+                result.context = context;
+            }
+            if (this.parser.peek()?.value === '=') {
+                this.parser.consume('=');
+                this.parseRuleTargetTransform(result);
+            }
+            if (this.parser.peek()?.value === 'as') {
+                this.parser.consume('Symbol', 'as');
+                result.variable = this.parser.consume().value;
+            }
+            if (this.parser.peek()?.value === 'first' ||
+                this.parser.peek()?.value === 'share' ||
+                this.parser.peek()?.value === 'last' ||
+                this.parser.peek()?.value === 'collate') {
+                result.listMode = [this.parser.consume().value];
+            }
+            return result;
         }
-        if (this.parser.peek()?.value === 'as') {
-            this.parser.consume('Symbol', 'as');
-            result.variable = this.parser.consume().value;
+        parseRuleTargetTransform(result) {
+            result.transform = 'copy';
+            const transformFhirPath = this.parser.consumeAndParse(6 /* OperatorPrecedence.As */);
+            if (transformFhirPath instanceof SymbolAtom) {
+                this.parseRuleTargetSymbol(result, transformFhirPath);
+            }
+            else if (transformFhirPath instanceof FunctionAtom) {
+                this.parseRuleTargetFunction(result, transformFhirPath);
+            }
+            else if (transformFhirPath instanceof LiteralAtom) {
+                this.parseRuleTargetLiteral(result, transformFhirPath);
+            }
+            else {
+                throw new Error(`Unexpected FHIRPath: ${transformFhirPath}`);
+            }
         }
-        if (this.parser.peek()?.value === 'first' ||
-            this.parser.peek()?.value === 'share' ||
-            this.parser.peek()?.value === 'last' ||
-            this.parser.peek()?.value === 'collate') {
-            result.listMode = [this.parser.consume().value];
+        parseRuleTargetSymbol(result, literalAtom) {
+            result.parameter = [{ valueId: literalAtom.name }];
         }
-        return result;
-    }, _StructureMapParser_parseRuleTargetTransform = function _StructureMapParser_parseRuleTargetTransform(result) {
-        result.transform = 'copy';
-        const transformFhirPath = this.parser.consumeAndParse(6 /* OperatorPrecedence.As */);
-        if (transformFhirPath instanceof SymbolAtom) {
-            __classPrivateFieldGet(this, _StructureMapParser_instances, "m", _StructureMapParser_parseRuleTargetSymbol).call(this, result, transformFhirPath);
+        parseRuleTargetFunction(result, functionAtom) {
+            const functionName = functionAtom.name;
+            switch (functionName) {
+                case 'create':
+                    result.parameter = [
+                        {
+                            valueString: (functionAtom.args?.[0]).value.value,
+                        },
+                    ];
+                    break;
+                case 'translate':
+                    result.parameter = [{}];
+                    break;
+                default:
+                    throw new Error('Unknown target function: ' + functionName);
+            }
         }
-        else if (transformFhirPath instanceof FunctionAtom) {
-            __classPrivateFieldGet(this, _StructureMapParser_instances, "m", _StructureMapParser_parseRuleTargetFunction).call(this, result, transformFhirPath);
+        parseRuleTargetLiteral(result, literalAtom) {
+            switch (literalAtom.value.type) {
+                case 'boolean':
+                    result.parameter = [{ valueBoolean: literalAtom.value.value }];
+                    break;
+                case 'decimal':
+                    result.parameter = [{ valueDecimal: literalAtom.value.value }];
+                    break;
+                case 'string':
+                    result.parameter = [{ valueString: literalAtom.value.value }];
+                    break;
+                default:
+                    throw new Error('Unknown target literal type: ' + literalAtom.value.type);
+            }
         }
-        else if (transformFhirPath instanceof LiteralAtom) {
-            __classPrivateFieldGet(this, _StructureMapParser_instances, "m", _StructureMapParser_parseRuleTargetLiteral).call(this, result, transformFhirPath);
+        parseRuleContext() {
+            let identifier = this.parser.consume().value;
+            while (this.parser.peek()?.value === '.') {
+                this.parser.consume('.');
+                identifier += '.' + this.parser.consume().value;
+            }
+            return identifier;
         }
-        else {
-            throw new Error(`Unexpected FHIRPath: ${transformFhirPath}`);
-        }
-    }, _StructureMapParser_parseRuleTargetSymbol = function _StructureMapParser_parseRuleTargetSymbol(result, literalAtom) {
-        result.parameter = [{ valueId: literalAtom.name }];
-    }, _StructureMapParser_parseRuleTargetFunction = function _StructureMapParser_parseRuleTargetFunction(result, functionAtom) {
-        const functionName = functionAtom.name;
-        switch (functionName) {
-            case 'create':
-                result.parameter = [
-                    {
-                        valueString: (functionAtom.args?.[0]).value.value,
-                    },
-                ];
-                break;
-            case 'translate':
-                result.parameter = [{}];
-                break;
-            default:
-                throw new Error('Unknown target function: ' + functionName);
+        parseRuleDependents() {
+            const atom = this.parser.consumeAndParse(100 /* OperatorPrecedence.Arrow */);
+            return [
+                {
+                    name: atom.name,
+                    variable: atom.args.map((arg) => arg.name),
+                },
+            ];
         }
-    }, _StructureMapParser_parseRuleTargetLiteral = function _StructureMapParser_parseRuleTargetLiteral(result, literalAtom) {
-        switch (literalAtom.value.type) {
-            case 'boolean':
-                result.parameter = [{ valueBoolean: literalAtom.value.value }];
-                break;
-            case 'decimal':
-                result.parameter = [{ valueDecimal: literalAtom.value.value }];
-                break;
-            case 'string':
-                result.parameter = [{ valueString: literalAtom.value.value }];
-                break;
-            default:
-                throw new Error('Unknown target literal type: ' + literalAtom.value.type);
-        }
-    }, _StructureMapParser_parseRuleContext = function _StructureMapParser_parseRuleContext() {
-        let identifier = this.parser.consume().value;
-        while (this.parser.peek()?.value === '.') {
-            this.parser.consume('.');
-            identifier += '.' + this.parser.consume().value;
-        }
-        return identifier;
-    }, _StructureMapParser_parseRuleDependents = function _StructureMapParser_parseRuleDependents() {
-        const atom = this.parser.consumeAndParse(100 /* OperatorPrecedence.Arrow */);
-        return [
-            {
-                name: atom.name,
-                variable: atom.args.map((arg) => arg.name),
-            },
-        ];
-    }, _StructureMapParser_parseConceptMap = function _StructureMapParser_parseConceptMap() {
-        while (this.parser.peek()?.value !== '}') {
-            this.parser.consume();
+        parseConceptMap() {
+            while (this.parser.peek()?.value !== '}') {
+                this.parser.consume();
+            }
+            this.parser.consume('}');
         }
-        this.parser.consume('}');
-    };
+    }
     const fhirPathParserBuilder$1 = initFhirPathParserBuilder()
         .registerInfix('->', { precedence: 100 /* OperatorPrecedence.Arrow */ })
         .registerInfix(';', { precedence: 200 /* OperatorPrecedence.Semicolon */ });
@@ -11562,7 +11631,6 @@
         }
     }
 
-    var _FhirSchemaValidator_instances, _FhirSchemaValidator_issues, _FhirSchemaValidator_root, _FhirSchemaValidator_validateObject, _FhirSchemaValidator_checkProperties, _FhirSchemaValidator_checkProperty, _FhirSchemaValidator_checkPropertyValue, _FhirSchemaValidator_validatePrimitiveType, _FhirSchemaValidator_validateString, _FhirSchemaValidator_validateNumber, _FhirSchemaValidator_checkAdditionalProperties, _FhirSchemaValidator_checkAdditionalProperty, _FhirSchemaValidator_checkPrimitiveElement, _FhirSchemaValidator_createIssue;
     /*
      * This file provides schema validation utilities for FHIR JSON objects.
      *
@@ -11724,14 +11792,11 @@
     }
     class FhirSchemaValidator {
         constructor(root) {
-            _FhirSchemaValidator_instances.add(this);
-            _FhirSchemaValidator_issues.set(this, void 0);
-            _FhirSchemaValidator_root.set(this, void 0);
-            __classPrivateFieldSet(this, _FhirSchemaValidator_issues, [], "f");
-            __classPrivateFieldSet(this, _FhirSchemaValidator_root, root, "f");
+            this.issues = [];
+            this.root = root;
         }
         validate() {
-            const resource = __classPrivateFieldGet(this, _FhirSchemaValidator_root, "f");
+            const resource = this.root;
             if (!resource) {
                 throw new OperationOutcomeError(validationError('Resource is null'));
             }
@@ -11740,142 +11805,172 @@
                 throw new OperationOutcomeError(validationError('Missing resource type'));
             }
             // Check for "null" once for the entire object hierarchy
-            checkForNull(resource, '', __classPrivateFieldGet(this, _FhirSchemaValidator_issues, "f"));
-            __classPrivateFieldGet(this, _FhirSchemaValidator_instances, "m", _FhirSchemaValidator_validateObject).call(this, toTypedValue(resource), resourceType);
-            if (__classPrivateFieldGet(this, _FhirSchemaValidator_issues, "f").length > 0) {
+            checkForNull(resource, '', this.issues);
+            this.validateObject(toTypedValue(resource), resourceType);
+            if (this.issues.length > 0) {
                 throw new OperationOutcomeError({
                     resourceType: 'OperationOutcome',
-                    issue: __classPrivateFieldGet(this, _FhirSchemaValidator_issues, "f"),
+                    issue: this.issues,
                 });
             }
         }
-    }
-    _FhirSchemaValidator_issues = new WeakMap(), _FhirSchemaValidator_root = new WeakMap(), _FhirSchemaValidator_instances = new WeakSet(), _FhirSchemaValidator_validateObject = function _FhirSchemaValidator_validateObject(typedValue, path) {
-        const definition = globalSchema.types[typedValue.type];
-        if (!definition) {
-            throw new OperationOutcomeError(validationError('Unknown type: ' + typedValue.type));
-        }
-        const propertyDefinitions = definition.properties;
-        __classPrivateFieldGet(this, _FhirSchemaValidator_instances, "m", _FhirSchemaValidator_checkProperties).call(this, path, propertyDefinitions, typedValue);
-        __classPrivateFieldGet(this, _FhirSchemaValidator_instances, "m", _FhirSchemaValidator_checkAdditionalProperties).call(this, path, typedValue, propertyDefinitions);
-    }, _FhirSchemaValidator_checkProperties = function _FhirSchemaValidator_checkProperties(path, propertyDefinitions, typedValue) {
-        for (const [key, elementDefinition] of Object.entries(propertyDefinitions)) {
-            __classPrivateFieldGet(this, _FhirSchemaValidator_instances, "m", _FhirSchemaValidator_checkProperty).call(this, path + '.' + key, elementDefinition, typedValue);
+        validateObject(typedValue, path) {
+            const definition = globalSchema.types[typedValue.type];
+            if (!definition) {
+                throw new OperationOutcomeError(validationError('Unknown type: ' + typedValue.type));
+            }
+            const propertyDefinitions = definition.properties;
+            this.checkProperties(path, propertyDefinitions, typedValue);
+            this.checkAdditionalProperties(path, typedValue, propertyDefinitions);
         }
-    }, _FhirSchemaValidator_checkProperty = function _FhirSchemaValidator_checkProperty(path, elementDefinition, typedValue) {
-        const propertyName = path.split('.').pop();
-        const value = getTypedPropertyValue(typedValue, propertyName);
-        if (isEmpty(value)) {
-            if (elementDefinition.min !== undefined && elementDefinition.min > 0) {
-                __classPrivateFieldGet(this, _FhirSchemaValidator_issues, "f").push(createStructureIssue(path, 'Missing required property'));
+        checkProperties(path, propertyDefinitions, typedValue) {
+            for (const [key, elementDefinition] of Object.entries(propertyDefinitions)) {
+                this.checkProperty(path + '.' + key, elementDefinition, typedValue);
             }
-            return;
         }
-        if (elementDefinition.max === '*') {
-            if (!Array.isArray(value)) {
-                __classPrivateFieldGet(this, _FhirSchemaValidator_issues, "f").push(createStructureIssue(path, 'Expected array for property'));
+        checkProperty(path, elementDefinition, typedValue) {
+            const propertyName = path.split('.').pop();
+            const value = getTypedPropertyValue(typedValue, propertyName);
+            if (isEmpty(value)) {
+                if (elementDefinition.min !== undefined && elementDefinition.min > 0) {
+                    this.issues.push(createStructureIssue(path, 'Missing required property'));
+                }
                 return;
             }
-            for (const item of value) {
-                __classPrivateFieldGet(this, _FhirSchemaValidator_instances, "m", _FhirSchemaValidator_checkPropertyValue).call(this, path, elementDefinition, item);
+            if (elementDefinition.max === '*') {
+                if (!Array.isArray(value)) {
+                    this.issues.push(createStructureIssue(path, 'Expected array for property'));
+                    return;
+                }
+                for (const item of value) {
+                    this.checkPropertyValue(path, elementDefinition, item);
+                }
+            }
+            else {
+                if (Array.isArray(value)) {
+                    this.issues.push(createStructureIssue(path, 'Expected single value for property'));
+                    return;
+                }
+                this.checkPropertyValue(path, elementDefinition, value);
             }
         }
-        else {
-            if (Array.isArray(value)) {
-                __classPrivateFieldGet(this, _FhirSchemaValidator_issues, "f").push(createStructureIssue(path, 'Expected single value for property'));
+        checkPropertyValue(path, elementDefinition, typedValue) {
+            if (typedValue.value === null) {
+                // Null handled separately
                 return;
             }
-            __classPrivateFieldGet(this, _FhirSchemaValidator_instances, "m", _FhirSchemaValidator_checkPropertyValue).call(this, path, elementDefinition, value);
-        }
-    }, _FhirSchemaValidator_checkPropertyValue = function _FhirSchemaValidator_checkPropertyValue(path, elementDefinition, typedValue) {
-        if (typedValue.value === null) {
-            // Null handled separately
-            return;
-        }
-        if (isLowerCase(typedValue.type.charAt(0))) {
-            __classPrivateFieldGet(this, _FhirSchemaValidator_instances, "m", _FhirSchemaValidator_validatePrimitiveType).call(this, elementDefinition, typedValue);
-        }
-        else {
-            __classPrivateFieldGet(this, _FhirSchemaValidator_instances, "m", _FhirSchemaValidator_validateObject).call(this, typedValue, path);
-        }
-    }, _FhirSchemaValidator_validatePrimitiveType = function _FhirSchemaValidator_validatePrimitiveType(elementDefinition, typedValue) {
-        const { type, value } = typedValue;
-        if (value === null) {
-            // Null handled separately, so this code should never be reached
-            // Leaving this check in place for now, in case we change the null handling
-            return;
-        }
-        // First, make sure the value is the correct JS type
-        const expectedType = fhirTypeToJsType[typedValue.type];
-        if (typeof value !== expectedType) {
-            __classPrivateFieldGet(this, _FhirSchemaValidator_instances, "m", _FhirSchemaValidator_createIssue).call(this, elementDefinition, 'Invalid type for ' + type);
-            return;
-        }
-        // Then, perform additional checks for specialty types
-        if (expectedType === 'string') {
-            __classPrivateFieldGet(this, _FhirSchemaValidator_instances, "m", _FhirSchemaValidator_validateString).call(this, elementDefinition, type, value);
-        }
-        else if (expectedType === 'number') {
-            __classPrivateFieldGet(this, _FhirSchemaValidator_instances, "m", _FhirSchemaValidator_validateNumber).call(this, elementDefinition, type, value);
+            if (isLowerCase(typedValue.type.charAt(0))) {
+                this.validatePrimitiveType(elementDefinition, typedValue);
+            }
+            else {
+                this.validateObject(typedValue, path);
+            }
         }
-    }, _FhirSchemaValidator_validateString = function _FhirSchemaValidator_validateString(elementDefinition, type, value) {
-        if (!value.trim()) {
-            __classPrivateFieldGet(this, _FhirSchemaValidator_instances, "m", _FhirSchemaValidator_createIssue).call(this, elementDefinition, 'Invalid empty string');
-            return;
+        validatePrimitiveType(elementDefinition, typedValue) {
+            const { type, value } = typedValue;
+            if (value === null) {
+                // Null handled separately, so this code should never be reached
+                // Leaving this check in place for now, in case we change the null handling
+                return;
+            }
+            // First, make sure the value is the correct JS type
+            const expectedType = fhirTypeToJsType[typedValue.type];
+            if (typeof value !== expectedType) {
+                this.createIssue(elementDefinition, 'Invalid type for ' + type);
+                return;
+            }
+            // Then, perform additional checks for specialty types
+            if (expectedType === 'string') {
+                this.validateString(elementDefinition, type, value);
+            }
+            else if (expectedType === 'number') {
+                this.validateNumber(elementDefinition, type, value);
+            }
         }
-        // Try to get the regex
-        const valueDefinition = globalSchema.types[type]?.properties?.['value'];
-        if (valueDefinition?.type) {
-            const regex = getExtensionValue(valueDefinition.type[0], 'http://hl7.org/fhir/StructureDefinition/regex');
-            if (regex) {
-                if (!value.match(new RegExp(regex))) {
-                    __classPrivateFieldGet(this, _FhirSchemaValidator_instances, "m", _FhirSchemaValidator_createIssue).call(this, elementDefinition, 'Invalid ' + type + ' format');
+        validateString(elementDefinition, type, value) {
+            if (!value.trim()) {
+                this.createIssue(elementDefinition, 'Invalid empty string');
+                return;
+            }
+            // Try to get the regex
+            const valueDefinition = globalSchema.types[type]?.properties?.['value'];
+            if (valueDefinition?.type) {
+                const regex = getExtensionValue(valueDefinition.type[0], 'http://hl7.org/fhir/StructureDefinition/regex');
+                if (regex) {
+                    if (!value.match(new RegExp(regex))) {
+                        this.createIssue(elementDefinition, 'Invalid ' + type + ' format');
+                    }
                 }
             }
         }
-    }, _FhirSchemaValidator_validateNumber = function _FhirSchemaValidator_validateNumber(elementDefinition, type, value) {
-        if (isNaN(value) || !isFinite(value)) {
-            __classPrivateFieldGet(this, _FhirSchemaValidator_instances, "m", _FhirSchemaValidator_createIssue).call(this, elementDefinition, 'Invalid ' + type + ' value');
-            return;
-        }
-        if (isIntegerType(type) && !Number.isInteger(value)) {
-            __classPrivateFieldGet(this, _FhirSchemaValidator_instances, "m", _FhirSchemaValidator_createIssue).call(this, elementDefinition, 'Number is not an integer');
-        }
-        if (type === exports.PropertyType.positiveInt && value <= 0) {
-            __classPrivateFieldGet(this, _FhirSchemaValidator_instances, "m", _FhirSchemaValidator_createIssue).call(this, elementDefinition, 'Number is less than or equal to zero');
-        }
-        if (type === exports.PropertyType.unsignedInt && value < 0) {
-            __classPrivateFieldGet(this, _FhirSchemaValidator_instances, "m", _FhirSchemaValidator_createIssue).call(this, elementDefinition, 'Number is negative');
+        validateNumber(elementDefinition, type, value) {
+            if (isNaN(value) || !isFinite(value)) {
+                this.createIssue(elementDefinition, 'Invalid ' + type + ' value');
+                return;
+            }
+            if (isIntegerType(type) && !Number.isInteger(value)) {
+                this.createIssue(elementDefinition, 'Number is not an integer');
+            }
+            if (type === exports.PropertyType.positiveInt && value <= 0) {
+                this.createIssue(elementDefinition, 'Number is less than or equal to zero');
+            }
+            if (type === exports.PropertyType.unsignedInt && value < 0) {
+                this.createIssue(elementDefinition, 'Number is negative');
+            }
         }
-    }, _FhirSchemaValidator_checkAdditionalProperties = function _FhirSchemaValidator_checkAdditionalProperties(path, typedValue, propertyDefinitions) {
-        const object = typedValue.value;
-        for (const key of Object.keys(object)) {
-            __classPrivateFieldGet(this, _FhirSchemaValidator_instances, "m", _FhirSchemaValidator_checkAdditionalProperty).call(this, path, key, typedValue, propertyDefinitions);
+        checkAdditionalProperties(path, typedValue, propertyDefinitions) {
+            const object = typedValue.value;
+            for (const key of Object.keys(object)) {
+                this.checkAdditionalProperty(path, key, typedValue, propertyDefinitions);
+            }
         }
-    }, _FhirSchemaValidator_checkAdditionalProperty = function _FhirSchemaValidator_checkAdditionalProperty(path, key, typedValue, propertyDefinitions) {
-        if (!baseResourceProperties.has(key) &&
-            !(key in propertyDefinitions) &&
-            !isChoiceOfType(key, typedValue, propertyDefinitions) &&
-            !__classPrivateFieldGet(this, _FhirSchemaValidator_instances, "m", _FhirSchemaValidator_checkPrimitiveElement).call(this, path, key, typedValue)) {
-            const expression = `${path}.${key}`;
-            __classPrivateFieldGet(this, _FhirSchemaValidator_issues, "f").push(createStructureIssue(expression, `Invalid additional property "${expression}"`));
+        /**
+         * Checks if the given property is allowed on the given object.
+         * @param path The path of the current object.
+         * @param key The key of a property to check.
+         * @param typedValue The current object.
+         * @param propertyDefinitions The property definitions of the current object.
+         */
+        checkAdditionalProperty(path, key, typedValue, propertyDefinitions) {
+            if (!baseResourceProperties.has(key) &&
+                !(key in propertyDefinitions) &&
+                !isChoiceOfType(key, typedValue, propertyDefinitions) &&
+                !this.checkPrimitiveElement(path, key, typedValue)) {
+                const expression = `${path}.${key}`;
+                this.issues.push(createStructureIssue(expression, `Invalid additional property "${expression}"`));
+            }
         }
-    }, _FhirSchemaValidator_checkPrimitiveElement = function _FhirSchemaValidator_checkPrimitiveElement(path, key, typedValue) {
-        // Primitive element starts with underscore
-        if (!key.startsWith('_')) {
-            return false;
+        /**
+         * Checks the element for a primitive.
+         *
+         * FHIR elements with primitive data types are represented in two parts:
+         *   1) A JSON property with the name of the element, which has a JSON type of number, boolean, or string
+         *   2) a JSON property with _ prepended to the name of the element, which, if present, contains the value's id and/or extensions
+         *
+         * See: https://hl7.org/fhir/json.html#primitive
+         *
+         * @param path The path to the property
+         * @param key
+         * @param typedValue
+         */
+        checkPrimitiveElement(path, key, typedValue) {
+            // Primitive element starts with underscore
+            if (!key.startsWith('_')) {
+                return false;
+            }
+            // Validate the non-underscore property exists
+            const primitiveKey = key.slice(1);
+            if (!(primitiveKey in typedValue.value)) {
+                return false;
+            }
+            // Then validate the element
+            this.validateObject({ type: 'Element', value: typedValue.value[key] }, path);
+            return true;
         }
-        // Validate the non-underscore property exists
-        const primitiveKey = key.slice(1);
-        if (!(primitiveKey in typedValue.value)) {
-            return false;
+        createIssue(elementDefinition, message) {
+            this.issues.push(createStructureIssue(elementDefinition.path, message));
         }
-        // Then validate the element
-        __classPrivateFieldGet(this, _FhirSchemaValidator_instances, "m", _FhirSchemaValidator_validateObject).call(this, { type: 'Element', value: typedValue.value[key] }, path);
-        return true;
-    }, _FhirSchemaValidator_createIssue = function _FhirSchemaValidator_createIssue(elementDefinition, message) {
-        __classPrivateFieldGet(this, _FhirSchemaValidator_issues, "f").push(createStructureIssue(elementDefinition.path, message));
-    };
+    }
     function isIntegerType(propertyType) {
         return (propertyType === exports.PropertyType.integer ||
             propertyType === exports.PropertyType.positiveInt ||