@medplum/core 1.0.4 → 1.0.5

package/dist/cjs/index.js

@@ -6486,8 +6486,8 @@
 
     // PKCE auth based on:
     // https://aws.amazon.com/blogs/security/how-to-add-authentication-single-page-web-application-with-amazon-cognito-oauth2-implementation/
-    var _MedplumClient_instances, _MedplumClient_fetch, _MedplumClient_createPdf, _MedplumClient_storage, _MedplumClient_requestCache, _MedplumClient_cacheTime, _MedplumClient_baseUrl, _MedplumClient_clientId, _MedplumClient_authorizeUrl, _MedplumClient_tokenUrl, _MedplumClient_logoutUrl, _MedplumClient_onUnauthenticated, _MedplumClient_accessToken, _MedplumClient_refreshToken, _MedplumClient_refreshPromise, _MedplumClient_profilePromise, _MedplumClient_profile, _MedplumClient_config, _MedplumClient_addLogin, _MedplumClient_refreshProfile, _MedplumClient_getCacheEntry, _MedplumClient_setCacheEntry, _MedplumClient_request, _MedplumClient_addFetchOptionsDefaults, _MedplumClient_setRequestContentType, _MedplumClient_setRequestBody, _MedplumClient_handleUnauthenticated, _MedplumClient_requestAuthorization, _MedplumClient_refresh, _MedplumClient_fetchTokens, _MedplumClient_verifyTokens, _MedplumClient_setupStorageListener;
-    const MEDPLUM_VERSION = "1.0.4-6dbdb7f6";
+    var _MedplumClient_instances, _MedplumClient_fetch, _MedplumClient_createPdf, _MedplumClient_storage, _MedplumClient_requestCache, _MedplumClient_cacheTime, _MedplumClient_baseUrl, _MedplumClient_authorizeUrl, _MedplumClient_tokenUrl, _MedplumClient_logoutUrl, _MedplumClient_onUnauthenticated, _MedplumClient_clientId, _MedplumClient_clientSecret, _MedplumClient_accessToken, _MedplumClient_refreshToken, _MedplumClient_refreshPromise, _MedplumClient_profilePromise, _MedplumClient_profile, _MedplumClient_config, _MedplumClient_addLogin, _MedplumClient_refreshProfile, _MedplumClient_getCacheEntry, _MedplumClient_setCacheEntry, _MedplumClient_request, _MedplumClient_addFetchOptionsDefaults, _MedplumClient_setRequestContentType, _MedplumClient_setRequestBody, _MedplumClient_handleUnauthenticated, _MedplumClient_requestAuthorization, _MedplumClient_refresh, _MedplumClient_fetchTokens, _MedplumClient_verifyTokens, _MedplumClient_setupStorageListener;
+    const MEDPLUM_VERSION = "1.0.5-53328b63";
     const DEFAULT_BASE_URL = 'https://api.medplum.com/';
     const DEFAULT_RESOURCE_CACHE_SIZE = 1000;
     const DEFAULT_CACHE_TIME = 60000; // 60 seconds
@@ -6557,11 +6557,12 @@
             _MedplumClient_requestCache.set(this, void 0);
             _MedplumClient_cacheTime.set(this, void 0);
             _MedplumClient_baseUrl.set(this, void 0);
-            _MedplumClient_clientId.set(this, void 0);
             _MedplumClient_authorizeUrl.set(this, void 0);
             _MedplumClient_tokenUrl.set(this, void 0);
             _MedplumClient_logoutUrl.set(this, void 0);
             _MedplumClient_onUnauthenticated.set(this, void 0);
+            _MedplumClient_clientId.set(this, void 0);
+            _MedplumClient_clientSecret.set(this, void 0);
             _MedplumClient_accessToken.set(this, void 0);
             _MedplumClient_refreshToken.set(this, void 0);
             _MedplumClient_refreshPromise.set(this, void 0);
@@ -7841,6 +7842,8 @@
          */
         startClientLogin(clientId, clientSecret) {
             return __awaiter(this, void 0, void 0, function* () {
+                __classPrivateFieldSet(this, _MedplumClient_clientId, clientId, "f");
+                __classPrivateFieldSet(this, _MedplumClient_clientSecret, clientSecret, "f");
                 const formBody = new URLSearchParams();
                 formBody.set('grant_type', 'client_credentials');
                 formBody.set('client_id', clientId);
@@ -7849,7 +7852,7 @@
             });
         }
     }
-    _MedplumClient_fetch = new WeakMap(), _MedplumClient_createPdf = new WeakMap(), _MedplumClient_storage = new WeakMap(), _MedplumClient_requestCache = new WeakMap(), _MedplumClient_cacheTime = new WeakMap(), _MedplumClient_baseUrl = new WeakMap(), _MedplumClient_clientId = new WeakMap(), _MedplumClient_authorizeUrl = new WeakMap(), _MedplumClient_tokenUrl = new WeakMap(), _MedplumClient_logoutUrl = new WeakMap(), _MedplumClient_onUnauthenticated = new WeakMap(), _MedplumClient_accessToken = new WeakMap(), _MedplumClient_refreshToken = new WeakMap(), _MedplumClient_refreshPromise = new WeakMap(), _MedplumClient_profilePromise = new WeakMap(), _MedplumClient_profile = new WeakMap(), _MedplumClient_config = new WeakMap(), _MedplumClient_instances = new WeakSet(), _MedplumClient_addLogin = function _MedplumClient_addLogin(newLogin) {
+    _MedplumClient_fetch = new WeakMap(), _MedplumClient_createPdf = new WeakMap(), _MedplumClient_storage = new WeakMap(), _MedplumClient_requestCache = new WeakMap(), _MedplumClient_cacheTime = new WeakMap(), _MedplumClient_baseUrl = new WeakMap(), _MedplumClient_authorizeUrl = new WeakMap(), _MedplumClient_tokenUrl = new WeakMap(), _MedplumClient_logoutUrl = new WeakMap(), _MedplumClient_onUnauthenticated = new WeakMap(), _MedplumClient_clientId = new WeakMap(), _MedplumClient_clientSecret = new WeakMap(), _MedplumClient_accessToken = new WeakMap(), _MedplumClient_refreshToken = new WeakMap(), _MedplumClient_refreshPromise = new WeakMap(), _MedplumClient_profilePromise = new WeakMap(), _MedplumClient_profile = new WeakMap(), _MedplumClient_config = new WeakMap(), _MedplumClient_instances = new WeakSet(), _MedplumClient_addLogin = function _MedplumClient_addLogin(newLogin) {
         const logins = this.getLogins().filter((login) => { var _a, _b; return ((_a = login.profile) === null || _a === void 0 ? void 0 : _a.reference) !== ((_b = newLogin.profile) === null || _b === void 0 ? void 0 : _b.reference); });
         logins.push(newLogin);
         __classPrivateFieldGet(this, _MedplumClient_storage, "f").setObject('logins', logins);
@@ -7941,17 +7944,14 @@
             options.body = JSON.stringify(data);
         }
     }, _MedplumClient_handleUnauthenticated = function _MedplumClient_handleUnauthenticated(method, url, options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_refresh).call(this)
-                .then(() => __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_request).call(this, method, url, options))
-                .catch((error) => {
-                this.clear();
-                if (__classPrivateFieldGet(this, _MedplumClient_onUnauthenticated, "f")) {
-                    __classPrivateFieldGet(this, _MedplumClient_onUnauthenticated, "f").call(this);
-                }
-                return Promise.reject(error);
-            });
-        });
+        if (__classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_refresh).call(this)) {
+            return __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_request).call(this, method, url, options);
+        }
+        this.clear();
+        if (__classPrivateFieldGet(this, _MedplumClient_onUnauthenticated, "f")) {
+            __classPrivateFieldGet(this, _MedplumClient_onUnauthenticated, "f").call(this);
+        }
+        return Promise.reject(new Error('Unauthenticated'));
     }, _MedplumClient_requestAuthorization = function _MedplumClient_requestAuthorization() {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.startPkce();
@@ -7965,21 +7965,22 @@
             window.location.assign(url.toString());
         });
     }, _MedplumClient_refresh = function _MedplumClient_refresh() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (__classPrivateFieldGet(this, _MedplumClient_refreshPromise, "f")) {
-                return __classPrivateFieldGet(this, _MedplumClient_refreshPromise, "f");
-            }
-            if (!__classPrivateFieldGet(this, _MedplumClient_refreshToken, "f")) {
-                this.clear();
-                throw new Error('Invalid refresh token');
-            }
+        if (__classPrivateFieldGet(this, _MedplumClient_refreshPromise, "f")) {
+            return __classPrivateFieldGet(this, _MedplumClient_refreshPromise, "f");
+        }
+        if (__classPrivateFieldGet(this, _MedplumClient_refreshToken, "f")) {
             const formBody = new URLSearchParams();
             formBody.set('grant_type', 'refresh_token');
             formBody.set('client_id', __classPrivateFieldGet(this, _MedplumClient_clientId, "f"));
             formBody.set('refresh_token', __classPrivateFieldGet(this, _MedplumClient_refreshToken, "f"));
             __classPrivateFieldSet(this, _MedplumClient_refreshPromise, __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_fetchTokens).call(this, formBody), "f");
-            yield __classPrivateFieldGet(this, _MedplumClient_refreshPromise, "f");
-        });
+            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 = function _MedplumClient_fetchTokens(formBody) {
         return __awaiter(this, void 0, void 0, function* () {
             return __classPrivateFieldGet(this, _MedplumClient_fetch, "f").call(this, __classPrivateFieldGet(this, _MedplumClient_tokenUrl, "f"), {
@@ -8047,150 +8048,485 @@
         return url.endsWith('/') ? url : url + '/';
     }
 
-    function parseDateString(str) {
-        if (str.startsWith('T')) {
-            // If a time string,
-            // then normalize to full length.
-            return str + 'T00:00:00.000Z'.substring(str.length);
-        }
-        if (str.length <= 10) {
-            // If a local date (i.e., "2021-01-01"),
-            // then return as-is.
-            return str;
-        }
-        try {
-            // Try to normalize to UTC
-            return new Date(str).toISOString();
+    var _ParserBuilder_prefixParselets, _ParserBuilder_infixParselets, _Parser_tokens, _Parser_prefixParselets, _Parser_infixParselets;
+    class PrefixOperatorAtom {
+        constructor(operator, child) {
+            this.operator = operator;
+            this.child = child;
         }
-        catch (e) {
-            // Fallback to original input
-            // This happens on unsupported time formats such as "2021-01-01T12"
-            return str;
+        toString() {
+            return `${this.operator}(${this.child.toString()})`;
         }
     }
-
-    /**
-     * Returns a single element array with a typed boolean value.
-     * @param value The primitive boolean value.
-     * @returns Single element array with a typed boolean value.
-     */
-    function booleanToTypedValue(value) {
-        return [{ type: exports.PropertyType.boolean, value }];
-    }
-    /**
-     * Returns a "best guess" TypedValue for a given value.
-     * @param value The unknown value to check.
-     * @returns A "best guess" TypedValue for the given value.
-     */
-    function toTypedValue(value) {
-        if (value === null || value === undefined) {
-            return { type: 'undefined', value: undefined };
+    class InfixOperatorAtom {
+        constructor(operator, left, right) {
+            this.operator = operator;
+            this.left = left;
+            this.right = right;
         }
-        else if (Number.isSafeInteger(value)) {
-            return { type: exports.PropertyType.integer, value };
+        toString() {
+            return `${this.left.toString()} ${this.operator} ${this.right.toString()}`;
         }
-        else if (typeof value === 'number') {
-            return { type: exports.PropertyType.decimal, value };
+    }
+    class ParserBuilder {
+        constructor() {
+            _ParserBuilder_prefixParselets.set(this, {});
+            _ParserBuilder_infixParselets.set(this, {});
         }
-        else if (typeof value === 'boolean') {
-            return { type: exports.PropertyType.boolean, value };
+        registerInfix(tokenType, parselet) {
+            __classPrivateFieldGet(this, _ParserBuilder_infixParselets, "f")[tokenType] = parselet;
+            return this;
         }
-        else if (typeof value === 'string') {
-            return { type: exports.PropertyType.string, value };
+        registerPrefix(tokenType, parselet) {
+            __classPrivateFieldGet(this, _ParserBuilder_prefixParselets, "f")[tokenType] = parselet;
+            return this;
         }
-        else if (isQuantity(value)) {
-            return { type: exports.PropertyType.Quantity, value };
+        prefix(tokenType, precedence, builder) {
+            return this.registerPrefix(tokenType, {
+                parse(parser, token) {
+                    const right = parser.consumeAndParse(precedence);
+                    return builder(token, right);
+                },
+            });
         }
-        else if (typeof value === 'object' && 'resourceType' in value) {
-            return { type: value.resourceType, value };
+        infixLeft(tokenType, precedence, builder) {
+            return this.registerInfix(tokenType, {
+                parse(parser, left, token) {
+                    const right = parser.consumeAndParse(precedence);
+                    return builder(left, token, right);
+                },
+                precedence,
+            });
         }
-        else {
-            return { type: exports.PropertyType.BackboneElement, value };
+        construct(input) {
+            return new Parser(input, __classPrivateFieldGet(this, _ParserBuilder_prefixParselets, "f"), __classPrivateFieldGet(this, _ParserBuilder_infixParselets, "f"));
         }
     }
-    /**
-     * Converts unknown object into a JavaScript boolean.
-     * Note that this is different than the FHIRPath "toBoolean",
-     * which has particular semantics around arrays, empty arrays, and type conversions.
-     * @param obj Any value or array of values.
-     * @returns The converted boolean value according to FHIRPath rules.
-     */
-    function toJsBoolean(obj) {
-        return obj.length === 0 ? false : !!obj[0].value;
-    }
-    /**
-     * Returns the value of the property and the property type.
-     * Some property definitions support multiple types.
-     * For example, "Observation.value[x]" can be "valueString", "valueInteger", "valueQuantity", etc.
-     * According to the spec, there can only be one property for a given element definition.
-     * This function returns the value and the type.
-     * @param input The base context (FHIR resource or backbone element).
-     * @param path The property path.
-     * @returns The value of the property and the property type.
-     */
-    function getTypedPropertyValue(input, path) {
-        if (!(input === null || input === void 0 ? void 0 : input.value)) {
-            return undefined;
+    _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");
         }
-        const elementDefinition = getElementDefinition(input.type, path);
-        if (elementDefinition) {
-            const typedResult = getTypedPropertyValueWithSchema(input, path, elementDefinition);
-            if (typedResult) {
-                return typedResult;
-            }
+        hasMore() {
+            return __classPrivateFieldGet(this, _Parser_tokens, "f").length > 0;
         }
-        return getTypedPropertyValueWithoutSchema(input, path);
-    }
-    /**
-     * Returns the value of the property and the property type using a type schema.
-     * @param input The base context (FHIR resource or backbone element).
-     * @param path The property path.
-     * @param property The property element definition.
-     * @returns The value of the property and the property type.
-     */
-    function getTypedPropertyValueWithSchema(input, path, property) {
-        var _a;
-        const types = property.type;
-        if (!types || types.length === 0) {
-            return undefined;
+        match(expected) {
+            const token = this.peek();
+            if ((token === null || token === void 0 ? void 0 : token.id) !== expected) {
+                return false;
+            }
+            this.consume();
+            return true;
         }
-        let resultValue = undefined;
-        let resultType = 'undefined';
-        if (types.length === 1) {
-            resultValue = input.value[path];
-            resultType = types[0].code;
+        consumeAndParse(precedence = Infinity) {
+            const token = this.consume();
+            const prefix = __classPrivateFieldGet(this, _Parser_prefixParselets, "f")[token.id];
+            if (!prefix) {
+                throw Error(`Parse error at "${token.value}" (line ${token.line}, column ${token.column}). No matching prefix parselet.`);
+            }
+            let left = prefix.parse(this, token);
+            while (precedence > this.getPrecedence()) {
+                const next = this.consume();
+                const infix = this.getInfixParselet(next);
+                left = infix.parse(this, left, next);
+            }
+            return left;
         }
-        else {
-            for (const type of types) {
-                const path2 = path.replace('[x]', '') + capitalize(type.code);
-                if (path2 in input.value) {
-                    resultValue = input.value[path2];
-                    resultType = type.code;
-                    break;
-                }
+        getPrecedence() {
+            const nextToken = this.peek();
+            if (!nextToken) {
+                return Infinity;
             }
+            const parser = this.getInfixParselet(nextToken);
+            if (parser) {
+                return parser.precedence;
+            }
+            return Infinity;
         }
-        if (isEmpty(resultValue)) {
-            return undefined;
+        consume(expectedId, expectedValue) {
+            var _a, _b;
+            if (!__classPrivateFieldGet(this, _Parser_tokens, "f").length) {
+                throw Error('Cant consume unknown more tokens.');
+            }
+            if (expectedId && ((_a = this.peek()) === null || _a === void 0 ? void 0 : _a.id) !== expectedId) {
+                const actual = this.peek();
+                throw Error(`Expected ${expectedId} but got "${actual.id}" at line ${actual.line} column ${actual.column}.`);
+            }
+            if (expectedValue && ((_b = this.peek()) === null || _b === void 0 ? void 0 : _b.value) !== expectedValue) {
+                const actual = this.peek();
+                throw Error(`Expected "${expectedValue}" but got "${actual.value}" at line ${actual.line} column ${actual.column}.`);
+            }
+            return __classPrivateFieldGet(this, _Parser_tokens, "f").shift();
         }
-        if (resultType === 'Element' || resultType === 'BackboneElement') {
-            resultType = buildTypeName((_a = property.path) === null || _a === void 0 ? void 0 : _a.split('.'));
+        peek() {
+            return __classPrivateFieldGet(this, _Parser_tokens, "f").length > 0 ? __classPrivateFieldGet(this, _Parser_tokens, "f")[0] : undefined;
         }
-        if (Array.isArray(resultValue)) {
-            return resultValue.map((element) => toTypedValueWithType(element, resultType));
+        removeComments() {
+            __classPrivateFieldSet(this, _Parser_tokens, __classPrivateFieldGet(this, _Parser_tokens, "f").filter((t) => t.id !== 'Comment'), "f");
         }
-        else {
-            return toTypedValueWithType(resultValue, resultType);
+        getInfixParselet(token) {
+            return __classPrivateFieldGet(this, _Parser_infixParselets, "f")[token.id === 'Symbol' ? token.value : token.id];
         }
     }
-    function toTypedValueWithType(value, type) {
-        if (type === 'Resource' && typeof value === 'object' && 'resourceType' in value) {
-            type = value.resourceType;
+    _Parser_tokens = new WeakMap(), _Parser_prefixParselets = new WeakMap(), _Parser_infixParselets = new WeakMap();
+
+    var _Tokenizer_instances, _Tokenizer_str, _Tokenizer_keywords, _Tokenizer_operators, _Tokenizer_result, _Tokenizer_pos, _Tokenizer_markStack, _Tokenizer_prevToken, _Tokenizer_peekToken, _Tokenizer_consumeToken, _Tokenizer_consumeWhitespace, _Tokenizer_consumeMultiLineComment, _Tokenizer_consumeSingleLineComment, _Tokenizer_consumeString, _Tokenizer_consumeBacktickSymbol, _Tokenizer_consumeDateTime, _Tokenizer_consumeNumber, _Tokenizer_consumeSymbol, _Tokenizer_consumeOperator, _Tokenizer_consumeWhile, _Tokenizer_curr, _Tokenizer_prev, _Tokenizer_peek, _Tokenizer_mark, _Tokenizer_reset, _Tokenizer_advance, _Tokenizer_buildToken;
+    const STANDARD_UNITS = [
+        'year',
+        'years',
+        'month',
+        'months',
+        'week',
+        'weeks',
+        'day',
+        'days',
+        'hour',
+        'hours',
+        'minute',
+        'minutes',
+        'second',
+        'seconds',
+        'millisecond',
+        'milliseconds',
+    ];
+    class Tokenizer {
+        constructor(str, keywords, operators) {
+            _Tokenizer_instances.add(this);
+            _Tokenizer_str.set(this, void 0);
+            _Tokenizer_keywords.set(this, void 0);
+            _Tokenizer_operators.set(this, void 0);
+            _Tokenizer_result.set(this, []);
+            _Tokenizer_pos.set(this, { index: 0, line: 1, column: 0 });
+            _Tokenizer_markStack.set(this, []);
+            __classPrivateFieldSet(this, _Tokenizer_str, str, "f");
+            __classPrivateFieldSet(this, _Tokenizer_keywords, keywords, "f");
+            __classPrivateFieldSet(this, _Tokenizer_operators, operators, "f");
         }
-        return { type, value };
-    }
-    /**
-     * Returns the value of the property and the property type using a type schema.
+        tokenize() {
+            while (__classPrivateFieldGet(this, _Tokenizer_pos, "f").index < __classPrivateFieldGet(this, _Tokenizer_str, "f").length) {
+                const token = __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeToken).call(this);
+                if (token) {
+                    __classPrivateFieldGet(this, _Tokenizer_result, "f").push(token);
+                }
+            }
+            return __classPrivateFieldGet(this, _Tokenizer_result, "f");
+        }
+    }
+    _Tokenizer_str = new WeakMap(), _Tokenizer_keywords = new WeakMap(), _Tokenizer_operators = new WeakMap(), _Tokenizer_result = new WeakMap(), _Tokenizer_pos = new WeakMap(), _Tokenizer_markStack = new WeakMap(), _Tokenizer_instances = new WeakSet(), _Tokenizer_prevToken = function _Tokenizer_prevToken() {
+        return __classPrivateFieldGet(this, _Tokenizer_result, "f").slice(-1)[0];
+    }, _Tokenizer_peekToken = function _Tokenizer_peekToken() {
+        __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_mark).call(this);
+        const token = __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeToken).call(this);
+        __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_reset).call(this);
+        return token;
+    }, _Tokenizer_consumeToken = function _Tokenizer_consumeToken() {
+        __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeWhitespace).call(this);
+        const c = __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this);
+        if (!c) {
+            return undefined;
+        }
+        __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_mark).call(this);
+        const next = __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_peek).call(this);
+        if (c === '/' && next === '*') {
+            return __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeMultiLineComment).call(this);
+        }
+        if (c === '/' && next === '/') {
+            return __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeSingleLineComment).call(this);
+        }
+        if (c === "'" || c === '"') {
+            return __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeString).call(this, c);
+        }
+        if (c === '`') {
+            return __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeBacktickSymbol).call(this);
+        }
+        if (c === '@') {
+            return __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeDateTime).call(this);
+        }
+        if (c.match(/\d/)) {
+            return __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeNumber).call(this);
+        }
+        if (c.match(/\w/)) {
+            return __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeSymbol).call(this);
+        }
+        if (c === '$' && next.match(/\w/)) {
+            return __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeSymbol).call(this);
+        }
+        return __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeOperator).call(this);
+    }, _Tokenizer_consumeWhitespace = function _Tokenizer_consumeWhitespace() {
+        __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeWhile).call(this, () => __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this).match(/\s/));
+    }, _Tokenizer_consumeMultiLineComment = function _Tokenizer_consumeMultiLineComment() {
+        const start = __classPrivateFieldGet(this, _Tokenizer_pos, "f").index;
+        __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeWhile).call(this, () => __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this) !== '*' || __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_peek).call(this) !== '/');
+        __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_advance).call(this);
+        __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_advance).call(this);
+        return __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_buildToken).call(this, 'Comment', __classPrivateFieldGet(this, _Tokenizer_str, "f").substring(start, __classPrivateFieldGet(this, _Tokenizer_pos, "f").index));
+    }, _Tokenizer_consumeSingleLineComment = function _Tokenizer_consumeSingleLineComment() {
+        return __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_buildToken).call(this, 'Comment', __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeWhile).call(this, () => __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this) !== '\n'));
+    }, _Tokenizer_consumeString = function _Tokenizer_consumeString(endChar) {
+        __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_advance).call(this);
+        const result = __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_buildToken).call(this, 'String', __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeWhile).call(this, () => __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_prev).call(this) === '\\' || __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this) !== endChar));
+        __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_advance).call(this);
+        return result;
+    }, _Tokenizer_consumeBacktickSymbol = function _Tokenizer_consumeBacktickSymbol() {
+        __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_advance).call(this);
+        const result = __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_buildToken).call(this, 'Symbol', __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeWhile).call(this, () => __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this) !== '`'));
+        __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_advance).call(this);
+        return result;
+    }, _Tokenizer_consumeDateTime = function _Tokenizer_consumeDateTime() {
+        __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_advance).call(this); // Consume "@"
+        const start = __classPrivateFieldGet(this, _Tokenizer_pos, "f").index;
+        __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeWhile).call(this, () => __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this).match(/[\d-]/));
+        if (__classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this) === 'T') {
+            __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_advance).call(this);
+            __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeWhile).call(this, () => __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this).match(/[\d:]/));
+            if (__classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this) === '.' && __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_peek).call(this).match(/\d/)) {
+                __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_advance).call(this);
+                __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeWhile).call(this, () => __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this).match(/\d/));
+            }
+            if (__classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this) === 'Z') {
+                __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_advance).call(this);
+            }
+            else if (__classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this) === '+' || __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this) === '-') {
+                __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_advance).call(this);
+                __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeWhile).call(this, () => __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this).match(/[\d:]/));
+            }
+        }
+        return __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_buildToken).call(this, 'DateTime', __classPrivateFieldGet(this, _Tokenizer_str, "f").substring(start, __classPrivateFieldGet(this, _Tokenizer_pos, "f").index));
+    }, _Tokenizer_consumeNumber = function _Tokenizer_consumeNumber() {
+        const start = __classPrivateFieldGet(this, _Tokenizer_pos, "f").index;
+        let id = 'Number';
+        __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeWhile).call(this, () => __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this).match(/\d/));
+        if (__classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this) === '.' && __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_peek).call(this).match(/\d/)) {
+            __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_advance).call(this);
+            __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeWhile).call(this, () => __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this).match(/\d/));
+        }
+        if (__classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this) === ' ') {
+            if (isUnitToken(__classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_peekToken).call(this))) {
+                id = 'Quantity';
+                __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeToken).call(this);
+            }
+        }
+        return __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_buildToken).call(this, id, __classPrivateFieldGet(this, _Tokenizer_str, "f").substring(start, __classPrivateFieldGet(this, _Tokenizer_pos, "f").index));
+    }, _Tokenizer_consumeSymbol = function _Tokenizer_consumeSymbol() {
+        var _a;
+        const value = __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeWhile).call(this, () => __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this).match(/[$\w]/));
+        if (((_a = __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_prevToken).call(this)) === null || _a === void 0 ? void 0 : _a.value) !== '.' && __classPrivateFieldGet(this, _Tokenizer_keywords, "f").includes(value)) {
+            return __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_buildToken).call(this, value, value);
+        }
+        return __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_buildToken).call(this, 'Symbol', value);
+    }, _Tokenizer_consumeOperator = function _Tokenizer_consumeOperator() {
+        const c = __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this);
+        const next = __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_peek).call(this);
+        const twoCharOp = c + next;
+        if (__classPrivateFieldGet(this, _Tokenizer_operators, "f").includes(twoCharOp)) {
+            __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_advance).call(this);
+            __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_advance).call(this);
+            return __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_buildToken).call(this, twoCharOp, twoCharOp);
+        }
+        __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() {
+        var _a;
+        return (_a = __classPrivateFieldGet(this, _Tokenizer_str, "f")[__classPrivateFieldGet(this, _Tokenizer_pos, "f").index - 1]) !== null && _a !== void 0 ? _a : '';
+    }, _Tokenizer_peek = function _Tokenizer_peek() {
+        var _a;
+        return (_a = __classPrivateFieldGet(this, _Tokenizer_str, "f")[__classPrivateFieldGet(this, _Tokenizer_pos, "f").index + 1]) !== null && _a !== void 0 ? _a : '';
+    }, _Tokenizer_mark = function _Tokenizer_mark() {
+        __classPrivateFieldGet(this, _Tokenizer_markStack, "f").push(Object.assign({}, __classPrivateFieldGet(this, _Tokenizer_pos, "f")));
+    }, _Tokenizer_reset = function _Tokenizer_reset() {
+        const mark = __classPrivateFieldGet(this, _Tokenizer_markStack, "f").pop();
+        if (!mark) {
+            throw new Error('No mark to reset to');
+        }
+        __classPrivateFieldGet(this, _Tokenizer_pos, "f").index = mark.index;
+        __classPrivateFieldGet(this, _Tokenizer_pos, "f").line = mark.line;
+        __classPrivateFieldGet(this, _Tokenizer_pos, "f").column = mark.column;
+    }, _Tokenizer_advance = function _Tokenizer_advance() {
+        __classPrivateFieldGet(this, _Tokenizer_pos, "f").index++;
+        if (__classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this) === '\n') {
+            __classPrivateFieldGet(this, _Tokenizer_pos, "f").line++;
+            __classPrivateFieldGet(this, _Tokenizer_pos, "f").column = 0;
+        }
+        else {
+            __classPrivateFieldGet(this, _Tokenizer_pos, "f").column++;
+        }
+    }, _Tokenizer_buildToken = function _Tokenizer_buildToken(id, value) {
+        const mark = __classPrivateFieldGet(this, _Tokenizer_markStack, "f").pop();
+        if (!mark) {
+            throw new Error('No mark for token');
+        }
+        return Object.assign({ id,
+            value }, mark);
+    };
+    function isUnitToken(token) {
+        if (token) {
+            if (token.id === 'String') {
+                return true;
+            }
+            if (token.id === 'Symbol' && STANDARD_UNITS.includes(token.value)) {
+                return true;
+            }
+        }
+        return false;
+    }
+
+    function parseDateString(str) {
+        if (str.startsWith('T')) {
+            // If a time string,
+            // then normalize to full length.
+            return str + 'T00:00:00.000Z'.substring(str.length);
+        }
+        if (str.length <= 10) {
+            // If a local date (i.e., "2021-01-01"),
+            // then return as-is.
+            return str;
+        }
+        try {
+            // Try to normalize to UTC
+            return new Date(str).toISOString();
+        }
+        catch (e) {
+            // Fallback to original input
+            // This happens on unsupported time formats such as "2021-01-01T12"
+            return str;
+        }
+    }
+
+    /**
+     * Returns a single element array with a typed boolean value.
+     * @param value The primitive boolean value.
+     * @returns Single element array with a typed boolean value.
+     */
+    function booleanToTypedValue(value) {
+        return [{ type: exports.PropertyType.boolean, value }];
+    }
+    /**
+     * Returns a "best guess" TypedValue for a given value.
+     * @param value The unknown value to check.
+     * @returns A "best guess" TypedValue for the given value.
+     */
+    function toTypedValue(value) {
+        if (value === null || value === undefined) {
+            return { type: 'undefined', value: undefined };
+        }
+        else if (Number.isSafeInteger(value)) {
+            return { type: exports.PropertyType.integer, value };
+        }
+        else if (typeof value === 'number') {
+            return { type: exports.PropertyType.decimal, value };
+        }
+        else if (typeof value === 'boolean') {
+            return { type: exports.PropertyType.boolean, value };
+        }
+        else if (typeof value === 'string') {
+            return { type: exports.PropertyType.string, value };
+        }
+        else if (isQuantity(value)) {
+            return { type: exports.PropertyType.Quantity, value };
+        }
+        else if (typeof value === 'object' && 'resourceType' in value) {
+            return { type: value.resourceType, value };
+        }
+        else {
+            return { type: exports.PropertyType.BackboneElement, value };
+        }
+    }
+    /**
+     * Converts unknown object into a JavaScript boolean.
+     * Note that this is different than the FHIRPath "toBoolean",
+     * which has particular semantics around arrays, empty arrays, and type conversions.
+     * @param obj Any value or array of values.
+     * @returns The converted boolean value according to FHIRPath rules.
+     */
+    function toJsBoolean(obj) {
+        return obj.length === 0 ? false : !!obj[0].value;
+    }
+    /**
+     * Returns the value of the property and the property type.
+     * Some property definitions support multiple types.
+     * For example, "Observation.value[x]" can be "valueString", "valueInteger", "valueQuantity", etc.
+     * According to the spec, there can only be one property for a given element definition.
+     * This function returns the value and the type.
+     * @param input The base context (FHIR resource or backbone element).
+     * @param path The property path.
+     * @returns The value of the property and the property type.
+     */
+    function getTypedPropertyValue(input, path) {
+        if (!(input === null || input === void 0 ? void 0 : input.value)) {
+            return undefined;
+        }
+        const elementDefinition = getElementDefinition(input.type, path);
+        if (elementDefinition) {
+            const typedResult = getTypedPropertyValueWithSchema(input, path, elementDefinition);
+            if (typedResult) {
+                return typedResult;
+            }
+        }
+        return getTypedPropertyValueWithoutSchema(input, path);
+    }
+    /**
+     * Returns the value of the property and the property type using a type schema.
+     * @param input The base context (FHIR resource or backbone element).
+     * @param path The property path.
+     * @param property The property element definition.
+     * @returns The value of the property and the property type.
+     */
+    function getTypedPropertyValueWithSchema(input, path, property) {
+        var _a;
+        const types = property.type;
+        if (!types || types.length === 0) {
+            return undefined;
+        }
+        let resultValue = undefined;
+        let resultType = 'undefined';
+        if (types.length === 1) {
+            resultValue = input.value[path];
+            resultType = types[0].code;
+        }
+        else {
+            for (const type of types) {
+                const path2 = path.replace('[x]', '') + capitalize(type.code);
+                if (path2 in input.value) {
+                    resultValue = input.value[path2];
+                    resultType = type.code;
+                    break;
+                }
+            }
+        }
+        if (isEmpty(resultValue)) {
+            return undefined;
+        }
+        if (resultType === 'Element' || resultType === 'BackboneElement') {
+            resultType = buildTypeName((_a = property.path) === null || _a === void 0 ? void 0 : _a.split('.'));
+        }
+        if (Array.isArray(resultValue)) {
+            return resultValue.map((element) => toTypedValueWithType(element, resultType));
+        }
+        else {
+            return toTypedValueWithType(resultValue, resultType);
+        }
+    }
+    function toTypedValueWithType(value, type) {
+        if (type === 'Resource' && typeof value === 'object' && 'resourceType' in value) {
+            type = value.resourceType;
+        }
+        return { type, value };
+    }
+    /**
+     * Returns the value of the property and the property type using a type schema.
      * Note that because the type schema is not available, this function may be inaccurate.
      * In some cases, that is the desired behavior.
      * @param typedValue The base context (FHIR resource or backbone element).
@@ -9959,6 +10295,9 @@
                 throw new Error(`FhirPathError on "${this.original}": ${error}`);
             }
         }
+        toString() {
+            return this.child.toString();
+        }
     }
     class LiteralAtom {
         constructor(value) {
@@ -9967,6 +10306,13 @@
         eval() {
             return [this.value];
         }
+        toString() {
+            const value = this.value.value;
+            if (typeof value === 'string') {
+                return `'${value}'`;
+            }
+            return value.toString();
+        }
     }
     class SymbolAtom {
         constructor(name) {
@@ -9982,6 +10328,9 @@
                 .flat()
                 .filter((e) => (e === null || e === void 0 ? void 0 : e.value) !== undefined);
         }
+        toString() {
+            return this.name;
+        }
     }
     _SymbolAtom_instances = new WeakSet(), _SymbolAtom_evalValue = function _SymbolAtom_evalValue(typedValue) {
         const input = typedValue.value;
@@ -9997,582 +10346,276 @@
         eval() {
             return [];
         }
-    }
-    class UnaryOperatorAtom {
-        constructor(child, impl) {
-            this.child = child;
-            this.impl = impl;
-        }
-        eval(context) {
-            return this.impl(this.child.eval(context));
-        }
-    }
-    class AsAtom {
-        constructor(left, right) {
-            this.left = left;
-            this.right = right;
-        }
-        eval(context) {
-            return functions.ofType(this.left.eval(context), this.right);
+        toString() {
+            return '{}';
         }
     }
-    class ArithemticOperatorAtom {
-        constructor(left, right, impl) {
-            this.left = left;
-            this.right = right;
+    class UnaryOperatorAtom extends PrefixOperatorAtom {
+        constructor(operator, child, impl) {
+            super(operator, child);
             this.impl = impl;
         }
-        eval(context) {
-            const leftEvalResult = this.left.eval(context);
-            if (leftEvalResult.length !== 1) {
-                return [];
-            }
-            const rightEvalResult = this.right.eval(context);
-            if (rightEvalResult.length !== 1) {
-                return [];
-            }
-            const leftValue = leftEvalResult[0].value;
-            const rightValue = rightEvalResult[0].value;
-            const leftNumber = isQuantity(leftValue) ? leftValue.value : leftValue;
-            const rightNumber = isQuantity(rightValue) ? rightValue.value : rightValue;
-            const result = this.impl(leftNumber, rightNumber);
-            if (typeof result === 'boolean') {
-                return booleanToTypedValue(result);
-            }
-            else if (isQuantity(leftValue)) {
-                return [{ type: exports.PropertyType.Quantity, value: Object.assign(Object.assign({}, leftValue), { value: result }) }];
-            }
-            else {
-                return [toTypedValue(result)];
-            }
-        }
-    }
-    class ConcatAtom {
-        constructor(left, right) {
-            this.left = left;
-            this.right = right;
-        }
-        eval(context) {
-            const leftValue = this.left.eval(context);
-            const rightValue = this.right.eval(context);
-            const result = [...leftValue, ...rightValue];
-            if (result.length > 0 && result.every((e) => typeof e.value === 'string')) {
-                return [{ type: exports.PropertyType.string, value: result.map((e) => e.value).join('') }];
-            }
-            return result;
-        }
-    }
-    class ContainsAtom {
-        constructor(left, right) {
-            this.left = left;
-            this.right = right;
-        }
-        eval(context) {
-            const leftValue = this.left.eval(context);
-            const rightValue = this.right.eval(context);
-            return booleanToTypedValue(leftValue.some((e) => e.value === rightValue[0].value));
-        }
-    }
-    class InAtom {
-        constructor(left, right) {
-            this.left = left;
-            this.right = right;
-        }
-        eval(context) {
-            const leftValue = this.left.eval(context);
-            const rightValue = this.right.eval(context);
-            return booleanToTypedValue(rightValue.some((e) => e.value === leftValue[0].value));
-        }
-    }
-    class DotAtom {
-        constructor(left, right) {
-            this.left = left;
-            this.right = right;
-        }
-        eval(context) {
-            return this.right.eval(this.left.eval(context));
-        }
-    }
-    class UnionAtom {
-        constructor(left, right) {
-            this.left = left;
-            this.right = right;
-        }
-        eval(context) {
-            const leftResult = this.left.eval(context);
-            const rightResult = this.right.eval(context);
-            return removeDuplicates([...leftResult, ...rightResult]);
-        }
-    }
-    class EqualsAtom {
-        constructor(left, right) {
-            this.left = left;
-            this.right = right;
-        }
-        eval(context) {
-            const leftValue = this.left.eval(context);
-            const rightValue = this.right.eval(context);
-            return fhirPathArrayEquals(leftValue, rightValue);
-        }
-    }
-    class NotEqualsAtom {
-        constructor(left, right) {
-            this.left = left;
-            this.right = right;
-        }
-        eval(context) {
-            const leftValue = this.left.eval(context);
-            const rightValue = this.right.eval(context);
-            return fhirPathNot(fhirPathArrayEquals(leftValue, rightValue));
-        }
-    }
-    class EquivalentAtom {
-        constructor(left, right) {
-            this.left = left;
-            this.right = right;
-        }
-        eval(context) {
-            const leftValue = this.left.eval(context);
-            const rightValue = this.right.eval(context);
-            return fhirPathArrayEquivalent(leftValue, rightValue);
+        eval(context) {
+            return this.impl(this.child.eval(context));
+        }
+        toString() {
+            return this.child.toString();
         }
     }
-    class NotEquivalentAtom {
+    class AsAtom extends InfixOperatorAtom {
         constructor(left, right) {
-            this.left = left;
-            this.right = right;
+            super('as', left, right);
         }
         eval(context) {
-            const leftValue = this.left.eval(context);
-            const rightValue = this.right.eval(context);
-            return fhirPathNot(fhirPathArrayEquivalent(leftValue, rightValue));
+            return functions.ofType(this.left.eval(context), this.right);
         }
     }
-    class IsAtom {
-        constructor(left, right) {
-            this.left = left;
-            this.right = right;
+    class ArithemticOperatorAtom extends InfixOperatorAtom {
+        constructor(operator, left, right, impl) {
+            super(operator, left, right);
+            this.impl = impl;
         }
         eval(context) {
-            const leftValue = this.left.eval(context);
-            if (leftValue.length !== 1) {
+            const leftEvalResult = this.left.eval(context);
+            if (leftEvalResult.length !== 1) {
                 return [];
             }
-            const typeName = this.right.name;
-            return booleanToTypedValue(fhirPathIs(leftValue[0], typeName));
+            const rightEvalResult = this.right.eval(context);
+            if (rightEvalResult.length !== 1) {
+                return [];
+            }
+            const leftValue = leftEvalResult[0].value;
+            const rightValue = rightEvalResult[0].value;
+            const leftNumber = isQuantity(leftValue) ? leftValue.value : leftValue;
+            const rightNumber = isQuantity(rightValue) ? rightValue.value : rightValue;
+            const result = this.impl(leftNumber, rightNumber);
+            if (typeof result === 'boolean') {
+                return booleanToTypedValue(result);
+            }
+            else if (isQuantity(leftValue)) {
+                return [{ type: exports.PropertyType.Quantity, value: Object.assign(Object.assign({}, leftValue), { value: result }) }];
+            }
+            else {
+                return [toTypedValue(result)];
+            }
         }
     }
-    /**
-     * 6.5.1. and
-     * Returns true if both operands evaluate to true,
-     * false if either operand evaluates to false,
-     * and the empty collection otherwise.
-     */
-    class AndAtom {
+    class ConcatAtom extends InfixOperatorAtom {
         constructor(left, right) {
-            this.left = left;
-            this.right = right;
+            super('&', left, right);
         }
         eval(context) {
-            var _a, _b, _c, _d;
             const leftValue = this.left.eval(context);
             const rightValue = this.right.eval(context);
-            if (((_a = leftValue[0]) === null || _a === void 0 ? void 0 : _a.value) === true && ((_b = rightValue[0]) === null || _b === void 0 ? void 0 : _b.value) === true) {
-                return booleanToTypedValue(true);
-            }
-            if (((_c = leftValue[0]) === null || _c === void 0 ? void 0 : _c.value) === false || ((_d = rightValue[0]) === null || _d === void 0 ? void 0 : _d.value) === false) {
-                return booleanToTypedValue(false);
+            const result = [...leftValue, ...rightValue];
+            if (result.length > 0 && result.every((e) => typeof e.value === 'string')) {
+                return [{ type: exports.PropertyType.string, value: result.map((e) => e.value).join('') }];
             }
-            return [];
+            return result;
         }
     }
-    class OrAtom {
+    class ContainsAtom extends InfixOperatorAtom {
         constructor(left, right) {
-            this.left = left;
-            this.right = right;
+            super('contains', left, right);
         }
         eval(context) {
             const leftValue = this.left.eval(context);
-            if (toJsBoolean(leftValue)) {
-                return leftValue;
-            }
             const rightValue = this.right.eval(context);
-            if (toJsBoolean(rightValue)) {
-                return rightValue;
-            }
-            return [];
+            return booleanToTypedValue(leftValue.some((e) => e.value === rightValue[0].value));
         }
     }
-    /**
-     * 6.5.4. xor
-     * Returns true if exactly one of the operands evaluates to true,
-     * false if either both operands evaluate to true or both operands evaluate to false,
-     * and the empty collection otherwise.
-     */
-    class XorAtom {
+    class InAtom extends InfixOperatorAtom {
         constructor(left, right) {
-            this.left = left;
-            this.right = right;
-        }
-        eval(context) {
-            const leftResult = this.left.eval(context);
-            const rightResult = this.right.eval(context);
-            if (leftResult.length === 0 && rightResult.length === 0) {
-                return [];
-            }
-            const leftValue = leftResult.length === 0 ? null : leftResult[0].value;
-            const rightValue = rightResult.length === 0 ? null : rightResult[0].value;
-            if ((leftValue === true && rightValue !== true) || (leftValue !== true && rightValue === true)) {
-                return booleanToTypedValue(true);
-            }
-            if ((leftValue === true && rightValue === true) || (leftValue === false && rightValue === false)) {
-                return booleanToTypedValue(false);
-            }
-            return [];
-        }
-    }
-    class FunctionAtom {
-        constructor(name, args, impl) {
-            this.name = name;
-            this.args = args;
-            this.impl = impl;
+            super('in', left, right);
         }
         eval(context) {
-            return this.impl(context, ...this.args);
+            const leftValue = this.left.eval(context);
+            const rightValue = this.right.eval(context);
+            return booleanToTypedValue(rightValue.some((e) => e.value === leftValue[0].value));
         }
     }
-    class IndexerAtom {
-        constructor(left, expr) {
-            this.left = left;
-            this.expr = expr;
+    class DotAtom extends InfixOperatorAtom {
+        constructor(left, right) {
+            super('.', left, right);
         }
         eval(context) {
-            const evalResult = this.expr.eval(context);
-            if (evalResult.length !== 1) {
-                return [];
-            }
-            const index = evalResult[0].value;
-            if (typeof index !== 'number') {
-                throw new Error(`Invalid indexer expression: should return integer}`);
-            }
-            const leftResult = this.left.eval(context);
-            if (!(index in leftResult)) {
-                return [];
-            }
-            return [leftResult[index]];
-        }
-    }
-
-    var _ParserBuilder_prefixParselets, _ParserBuilder_infixParselets, _Parser_tokens, _Parser_prefixParselets, _Parser_infixParselets;
-    class ParserBuilder {
-        constructor() {
-            _ParserBuilder_prefixParselets.set(this, {});
-            _ParserBuilder_infixParselets.set(this, {});
-        }
-        registerInfix(tokenType, parselet) {
-            __classPrivateFieldGet(this, _ParserBuilder_infixParselets, "f")[tokenType] = parselet;
-            return this;
-        }
-        registerPrefix(tokenType, parselet) {
-            __classPrivateFieldGet(this, _ParserBuilder_prefixParselets, "f")[tokenType] = parselet;
-            return this;
-        }
-        prefix(tokenType, precedence, builder) {
-            return this.registerPrefix(tokenType, {
-                parse(parser, token) {
-                    const right = parser.consumeAndParse(precedence);
-                    return builder(token, right);
-                },
-            });
-        }
-        infixLeft(tokenType, precedence, builder) {
-            return this.registerInfix(tokenType, {
-                parse(parser, left, token) {
-                    const right = parser.consumeAndParse(precedence);
-                    return builder(left, token, right);
-                },
-                precedence,
-            });
-        }
-        construct(input) {
-            return new Parser(input, __classPrivateFieldGet(this, _ParserBuilder_prefixParselets, "f"), __classPrivateFieldGet(this, _ParserBuilder_infixParselets, "f"));
-        }
-    }
-    _ParserBuilder_prefixParselets = new WeakMap(), _ParserBuilder_infixParselets = new WeakMap();
-    class Parser {
-        constructor(tokens, prefixParselets, infixParselets) {
-            _Parser_tokens.set(this, void 0);
-            _Parser_prefixParselets.set(this, void 0);
-            _Parser_infixParselets.set(this, void 0);
-            __classPrivateFieldSet(this, _Parser_tokens, tokens, "f");
-            __classPrivateFieldSet(this, _Parser_prefixParselets, prefixParselets, "f");
-            __classPrivateFieldSet(this, _Parser_infixParselets, infixParselets, "f");
-        }
-        hasMore() {
-            return __classPrivateFieldGet(this, _Parser_tokens, "f").length > 0;
-        }
-        match(expected) {
-            const token = this.peek();
-            if ((token === null || token === void 0 ? void 0 : token.id) !== expected) {
-                return false;
-            }
-            this.consume();
-            return true;
-        }
-        consumeAndParse(precedence = Infinity) {
-            const token = this.consume();
-            const prefix = __classPrivateFieldGet(this, _Parser_prefixParselets, "f")[token.id];
-            if (!prefix) {
-                throw Error(`Parse error at "${token.value}" (line ${token.line}, column ${token.column}). No matching prefix parselet.`);
-            }
-            let left = prefix.parse(this, token);
-            while (precedence > this.getPrecedence()) {
-                const next = this.consume();
-                const infix = __classPrivateFieldGet(this, _Parser_infixParselets, "f")[next.id];
-                left = infix.parse(this, left, next);
-            }
-            return left;
-        }
-        getPrecedence() {
-            const nextToken = this.peek();
-            if (!nextToken) {
-                return Infinity;
-            }
-            const parser = __classPrivateFieldGet(this, _Parser_infixParselets, "f")[nextToken.id];
-            if (parser) {
-                return parser.precedence;
-            }
-            return Infinity;
-        }
-        consume(expected) {
-            var _a;
-            if (!__classPrivateFieldGet(this, _Parser_tokens, "f").length) {
-                throw Error('Cant consume unknown more tokens.');
-            }
-            if (expected && ((_a = this.peek()) === null || _a === void 0 ? void 0 : _a.id) !== expected) {
-                const actual = this.peek();
-                throw Error(`Expected ${expected} but got "${actual.value}" at line ${actual.line} column ${actual.column}.`);
-            }
-            return __classPrivateFieldGet(this, _Parser_tokens, "f").shift();
-        }
-        peek() {
-            return __classPrivateFieldGet(this, _Parser_tokens, "f").length > 0 ? __classPrivateFieldGet(this, _Parser_tokens, "f")[0] : undefined;
+            return this.right.eval(this.left.eval(context));
         }
-        removeComments() {
-            __classPrivateFieldSet(this, _Parser_tokens, __classPrivateFieldGet(this, _Parser_tokens, "f").filter((t) => t.id !== 'Comment'), "f");
+        toString() {
+            return `${this.left.toString()}.${this.right.toString()}`;
         }
     }
-    _Parser_tokens = new WeakMap(), _Parser_prefixParselets = new WeakMap(), _Parser_infixParselets = new WeakMap();
-
-    var _Tokenizer_instances, _Tokenizer_str, _Tokenizer_keywords, _Tokenizer_operators, _Tokenizer_result, _Tokenizer_pos, _Tokenizer_markStack, _Tokenizer_prevToken, _Tokenizer_peekToken, _Tokenizer_consumeToken, _Tokenizer_consumeWhitespace, _Tokenizer_consumeMultiLineComment, _Tokenizer_consumeSingleLineComment, _Tokenizer_consumeString, _Tokenizer_consumeBacktickSymbol, _Tokenizer_consumeDateTime, _Tokenizer_consumeNumber, _Tokenizer_consumeSymbol, _Tokenizer_consumeOperator, _Tokenizer_consumeWhile, _Tokenizer_curr, _Tokenizer_prev, _Tokenizer_peek, _Tokenizer_mark, _Tokenizer_reset, _Tokenizer_advance, _Tokenizer_buildToken;
-    const STANDARD_UNITS = [
-        'year',
-        'years',
-        'month',
-        'months',
-        'week',
-        'weeks',
-        'day',
-        'days',
-        'hour',
-        'hours',
-        'minute',
-        'minutes',
-        'second',
-        'seconds',
-        'millisecond',
-        'milliseconds',
-    ];
-    class Tokenizer {
-        constructor(str, keywords, operators) {
-            _Tokenizer_instances.add(this);
-            _Tokenizer_str.set(this, void 0);
-            _Tokenizer_keywords.set(this, void 0);
-            _Tokenizer_operators.set(this, void 0);
-            _Tokenizer_result.set(this, []);
-            _Tokenizer_pos.set(this, { index: 0, line: 0, column: 0 });
-            _Tokenizer_markStack.set(this, []);
-            __classPrivateFieldSet(this, _Tokenizer_str, str, "f");
-            __classPrivateFieldSet(this, _Tokenizer_keywords, keywords, "f");
-            __classPrivateFieldSet(this, _Tokenizer_operators, operators, "f");
-        }
-        tokenize() {
-            while (__classPrivateFieldGet(this, _Tokenizer_pos, "f").index < __classPrivateFieldGet(this, _Tokenizer_str, "f").length) {
-                const token = __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeToken).call(this);
-                if (token) {
-                    __classPrivateFieldGet(this, _Tokenizer_result, "f").push(token);
-                }
-            }
-            return __classPrivateFieldGet(this, _Tokenizer_result, "f");
+    class UnionAtom extends InfixOperatorAtom {
+        constructor(left, right) {
+            super('|', left, right);
+        }
+        eval(context) {
+            const leftResult = this.left.eval(context);
+            const rightResult = this.right.eval(context);
+            return removeDuplicates([...leftResult, ...rightResult]);
         }
     }
-    _Tokenizer_str = new WeakMap(), _Tokenizer_keywords = new WeakMap(), _Tokenizer_operators = new WeakMap(), _Tokenizer_result = new WeakMap(), _Tokenizer_pos = new WeakMap(), _Tokenizer_markStack = new WeakMap(), _Tokenizer_instances = new WeakSet(), _Tokenizer_prevToken = function _Tokenizer_prevToken() {
-        return __classPrivateFieldGet(this, _Tokenizer_result, "f").slice(-1)[0];
-    }, _Tokenizer_peekToken = function _Tokenizer_peekToken() {
-        __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_mark).call(this);
-        const token = __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeToken).call(this);
-        __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_reset).call(this);
-        return token;
-    }, _Tokenizer_consumeToken = function _Tokenizer_consumeToken() {
-        __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeWhitespace).call(this);
-        const c = __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this);
-        if (!c) {
-            return undefined;
+    class EqualsAtom extends InfixOperatorAtom {
+        constructor(left, right) {
+            super('=', left, right);
         }
-        __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_mark).call(this);
-        const next = __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_peek).call(this);
-        if (c === '/' && next === '*') {
-            return __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeMultiLineComment).call(this);
+        eval(context) {
+            const leftValue = this.left.eval(context);
+            const rightValue = this.right.eval(context);
+            return fhirPathArrayEquals(leftValue, rightValue);
         }
-        if (c === '/' && next === '/') {
-            return __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeSingleLineComment).call(this);
+    }
+    class NotEqualsAtom extends InfixOperatorAtom {
+        constructor(left, right) {
+            super('!=', left, right);
         }
-        if (c === "'" || c === '"') {
-            return __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeString).call(this, c);
+        eval(context) {
+            const leftValue = this.left.eval(context);
+            const rightValue = this.right.eval(context);
+            return fhirPathNot(fhirPathArrayEquals(leftValue, rightValue));
         }
-        if (c === '`') {
-            return __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeBacktickSymbol).call(this);
+    }
+    class EquivalentAtom extends InfixOperatorAtom {
+        constructor(left, right) {
+            super('~', left, right);
         }
-        if (c === '@') {
-            return __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeDateTime).call(this);
+        eval(context) {
+            const leftValue = this.left.eval(context);
+            const rightValue = this.right.eval(context);
+            return fhirPathArrayEquivalent(leftValue, rightValue);
         }
-        if (c.match(/\d/)) {
-            return __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeNumber).call(this);
+    }
+    class NotEquivalentAtom extends InfixOperatorAtom {
+        constructor(left, right) {
+            super('!~', left, right);
         }
-        if (c.match(/\w/)) {
-            return __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeSymbol).call(this);
+        eval(context) {
+            const leftValue = this.left.eval(context);
+            const rightValue = this.right.eval(context);
+            return fhirPathNot(fhirPathArrayEquivalent(leftValue, rightValue));
         }
-        if (c === '$' && next.match(/\w/)) {
-            return __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeSymbol).call(this);
+    }
+    class IsAtom extends InfixOperatorAtom {
+        constructor(left, right) {
+            super('is', left, right);
         }
-        return __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeOperator).call(this);
-    }, _Tokenizer_consumeWhitespace = function _Tokenizer_consumeWhitespace() {
-        __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeWhile).call(this, () => __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this).match(/\s/));
-    }, _Tokenizer_consumeMultiLineComment = function _Tokenizer_consumeMultiLineComment() {
-        const start = __classPrivateFieldGet(this, _Tokenizer_pos, "f").index;
-        __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeWhile).call(this, () => __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this) !== '*' || __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_peek).call(this) !== '/');
-        __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_advance).call(this);
-        __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_advance).call(this);
-        return __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_buildToken).call(this, 'Comment', __classPrivateFieldGet(this, _Tokenizer_str, "f").substring(start, __classPrivateFieldGet(this, _Tokenizer_pos, "f").index));
-    }, _Tokenizer_consumeSingleLineComment = function _Tokenizer_consumeSingleLineComment() {
-        return __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_buildToken).call(this, 'Comment', __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeWhile).call(this, () => __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this) !== '\n'));
-    }, _Tokenizer_consumeString = function _Tokenizer_consumeString(endChar) {
-        __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_advance).call(this);
-        const result = __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_buildToken).call(this, 'String', __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeWhile).call(this, () => __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_prev).call(this) === '\\' || __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this) !== endChar));
-        __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_advance).call(this);
-        return result;
-    }, _Tokenizer_consumeBacktickSymbol = function _Tokenizer_consumeBacktickSymbol() {
-        __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_advance).call(this);
-        const result = __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_buildToken).call(this, 'Symbol', __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeWhile).call(this, () => __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this) !== '`'));
-        __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_advance).call(this);
-        return result;
-    }, _Tokenizer_consumeDateTime = function _Tokenizer_consumeDateTime() {
-        __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_advance).call(this); // Consume "@"
-        const start = __classPrivateFieldGet(this, _Tokenizer_pos, "f").index;
-        __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeWhile).call(this, () => __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this).match(/[\d-]/));
-        if (__classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this) === 'T') {
-            __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_advance).call(this);
-            __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeWhile).call(this, () => __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this).match(/[\d:]/));
-            if (__classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this) === '.' && __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_peek).call(this).match(/\d/)) {
-                __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_advance).call(this);
-                __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeWhile).call(this, () => __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this).match(/\d/));
+        eval(context) {
+            const leftValue = this.left.eval(context);
+            if (leftValue.length !== 1) {
+                return [];
             }
-            if (__classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this) === 'Z') {
-                __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_advance).call(this);
+            const typeName = this.right.name;
+            return booleanToTypedValue(fhirPathIs(leftValue[0], typeName));
+        }
+    }
+    /**
+     * 6.5.1. and
+     * Returns true if both operands evaluate to true,
+     * false if either operand evaluates to false,
+     * and the empty collection otherwise.
+     */
+    class AndAtom extends InfixOperatorAtom {
+        constructor(left, right) {
+            super('and', left, right);
+        }
+        eval(context) {
+            var _a, _b, _c, _d;
+            const leftValue = this.left.eval(context);
+            const rightValue = this.right.eval(context);
+            if (((_a = leftValue[0]) === null || _a === void 0 ? void 0 : _a.value) === true && ((_b = rightValue[0]) === null || _b === void 0 ? void 0 : _b.value) === true) {
+                return booleanToTypedValue(true);
             }
-            else if (__classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this) === '+' || __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this) === '-') {
-                __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_advance).call(this);
-                __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeWhile).call(this, () => __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this).match(/[\d:]/));
+            if (((_c = leftValue[0]) === null || _c === void 0 ? void 0 : _c.value) === false || ((_d = rightValue[0]) === null || _d === void 0 ? void 0 : _d.value) === false) {
+                return booleanToTypedValue(false);
             }
+            return [];
         }
-        return __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_buildToken).call(this, 'DateTime', __classPrivateFieldGet(this, _Tokenizer_str, "f").substring(start, __classPrivateFieldGet(this, _Tokenizer_pos, "f").index));
-    }, _Tokenizer_consumeNumber = function _Tokenizer_consumeNumber() {
-        const start = __classPrivateFieldGet(this, _Tokenizer_pos, "f").index;
-        let id = 'Number';
-        __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeWhile).call(this, () => __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this).match(/\d/));
-        if (__classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this) === '.' && __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_peek).call(this).match(/\d/)) {
-            __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_advance).call(this);
-            __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeWhile).call(this, () => __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this).match(/\d/));
+    }
+    class OrAtom extends InfixOperatorAtom {
+        constructor(left, right) {
+            super('or', left, right);
         }
-        if (__classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this) === ' ') {
-            if (isUnitToken(__classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_peekToken).call(this))) {
-                id = 'Quantity';
-                __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeToken).call(this);
+        eval(context) {
+            const leftValue = this.left.eval(context);
+            if (toJsBoolean(leftValue)) {
+                return leftValue;
             }
+            const rightValue = this.right.eval(context);
+            if (toJsBoolean(rightValue)) {
+                return rightValue;
+            }
+            return [];
         }
-        return __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_buildToken).call(this, id, __classPrivateFieldGet(this, _Tokenizer_str, "f").substring(start, __classPrivateFieldGet(this, _Tokenizer_pos, "f").index));
-    }, _Tokenizer_consumeSymbol = function _Tokenizer_consumeSymbol() {
-        var _a;
-        const value = __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeWhile).call(this, () => __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this).match(/[$\w]/));
-        if (((_a = __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_prevToken).call(this)) === null || _a === void 0 ? void 0 : _a.value) !== '.' && __classPrivateFieldGet(this, _Tokenizer_keywords, "f").includes(value)) {
-            return __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_buildToken).call(this, value, value);
-        }
-        return __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_buildToken).call(this, 'Symbol', value);
-    }, _Tokenizer_consumeOperator = function _Tokenizer_consumeOperator() {
-        const c = __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this);
-        const next = __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_peek).call(this);
-        const twoCharOp = c + next;
-        if (__classPrivateFieldGet(this, _Tokenizer_operators, "f").includes(twoCharOp)) {
-            __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_advance).call(this);
-            __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_advance).call(this);
-            return __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_buildToken).call(this, twoCharOp, twoCharOp);
+    }
+    /**
+     * 6.5.4. xor
+     * Returns true if exactly one of the operands evaluates to true,
+     * false if either both operands evaluate to true or both operands evaluate to false,
+     * and the empty collection otherwise.
+     */
+    class XorAtom extends InfixOperatorAtom {
+        constructor(left, right) {
+            super('xor', left, right);
         }
-        __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_advance).call(this);
-        return __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_buildToken).call(this, c, c);
-    }, _Tokenizer_consumeWhile = function _Tokenizer_consumeWhile(condition) {
-        const start = __classPrivateFieldGet(this, _Tokenizer_pos, "f").index;
-        while (__classPrivateFieldGet(this, _Tokenizer_pos, "f").index < __classPrivateFieldGet(this, _Tokenizer_str, "f").length && condition()) {
-            __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_advance).call(this);
+        eval(context) {
+            const leftResult = this.left.eval(context);
+            const rightResult = this.right.eval(context);
+            if (leftResult.length === 0 && rightResult.length === 0) {
+                return [];
+            }
+            const leftValue = leftResult.length === 0 ? null : leftResult[0].value;
+            const rightValue = rightResult.length === 0 ? null : rightResult[0].value;
+            if ((leftValue === true && rightValue !== true) || (leftValue !== true && rightValue === true)) {
+                return booleanToTypedValue(true);
+            }
+            if ((leftValue === true && rightValue === true) || (leftValue === false && rightValue === false)) {
+                return booleanToTypedValue(false);
+            }
+            return [];
         }
-        return __classPrivateFieldGet(this, _Tokenizer_str, "f").substring(start, __classPrivateFieldGet(this, _Tokenizer_pos, "f").index);
-    }, _Tokenizer_curr = function _Tokenizer_curr() {
-        return __classPrivateFieldGet(this, _Tokenizer_str, "f")[__classPrivateFieldGet(this, _Tokenizer_pos, "f").index];
-    }, _Tokenizer_prev = function _Tokenizer_prev() {
-        var _a;
-        return (_a = __classPrivateFieldGet(this, _Tokenizer_str, "f")[__classPrivateFieldGet(this, _Tokenizer_pos, "f").index - 1]) !== null && _a !== void 0 ? _a : '';
-    }, _Tokenizer_peek = function _Tokenizer_peek() {
-        var _a;
-        return (_a = __classPrivateFieldGet(this, _Tokenizer_str, "f")[__classPrivateFieldGet(this, _Tokenizer_pos, "f").index + 1]) !== null && _a !== void 0 ? _a : '';
-    }, _Tokenizer_mark = function _Tokenizer_mark() {
-        __classPrivateFieldGet(this, _Tokenizer_markStack, "f").push(Object.assign({}, __classPrivateFieldGet(this, _Tokenizer_pos, "f")));
-    }, _Tokenizer_reset = function _Tokenizer_reset() {
-        const mark = __classPrivateFieldGet(this, _Tokenizer_markStack, "f").pop();
-        if (!mark) {
-            throw new Error('No mark to reset to');
+    }
+    class FunctionAtom {
+        constructor(name, args) {
+            this.name = name;
+            this.args = args;
         }
-        __classPrivateFieldGet(this, _Tokenizer_pos, "f").index = mark.index;
-        __classPrivateFieldGet(this, _Tokenizer_pos, "f").line = mark.line;
-        __classPrivateFieldGet(this, _Tokenizer_pos, "f").column = mark.column;
-    }, _Tokenizer_advance = function _Tokenizer_advance() {
-        __classPrivateFieldGet(this, _Tokenizer_pos, "f").index++;
-        if (__classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this) === '\n') {
-            __classPrivateFieldGet(this, _Tokenizer_pos, "f").line++;
-            __classPrivateFieldGet(this, _Tokenizer_pos, "f").column = 0;
+        eval(context) {
+            const impl = functions[this.name];
+            if (!impl) {
+                throw new Error('Unrecognized function: ' + this.name);
+            }
+            return impl(context, ...this.args);
         }
-        else {
-            __classPrivateFieldGet(this, _Tokenizer_pos, "f").column++;
+        toString() {
+            return `${this.name}(${this.args.map((arg) => arg.toString()).join(', ')})`;
         }
-    }, _Tokenizer_buildToken = function _Tokenizer_buildToken(id, value) {
-        const mark = __classPrivateFieldGet(this, _Tokenizer_markStack, "f").pop();
-        if (!mark) {
-            throw new Error('No mark for token');
+    }
+    class IndexerAtom {
+        constructor(left, expr) {
+            this.left = left;
+            this.expr = expr;
         }
-        return Object.assign({ id,
-            value }, mark);
-    };
-    function isUnitToken(token) {
-        if (token) {
-            if (token.id === 'String') {
-                return true;
+        eval(context) {
+            const evalResult = this.expr.eval(context);
+            if (evalResult.length !== 1) {
+                return [];
             }
-            if (token.id === 'Symbol' && STANDARD_UNITS.includes(token.value)) {
-                return true;
+            const index = evalResult[0].value;
+            if (typeof index !== 'number') {
+                throw new Error(`Invalid indexer expression: should return integer}`);
+            }
+            const leftResult = this.left.eval(context);
+            if (!(index in leftResult)) {
+                return [];
             }
+            return [leftResult[index]];
+        }
+        toString() {
+            return `${this.left.toString()}[${this.expr.toString()}]`;
         }
-        return false;
     }
 
-    const FHIRPATH_KEYWORDS = ['true', 'false', 'and', 'as', 'contains', 'div', 'in', 'is', 'mod', 'or', 'xor'];
+    const FHIRPATH_KEYWORDS = ['true', 'false'];
     const FHIRPATH_OPERATORS = ['!=', '!~', '<=', '>=', '{}', '->'];
     function tokenize(str) {
         return new Tokenizer(str, FHIRPATH_KEYWORDS, FHIRPATH_OPERATORS).tokenize();
@@ -10580,9 +10623,10 @@
 
     const PARENTHESES_PARSELET = {
         parse(parser) {
+            var _a;
             const expr = parser.consumeAndParse();
             if (!parser.match(')')) {
-                throw new Error('Parse error: expected `)`');
+                throw new Error('Parse error: expected `)` got `' + ((_a = parser.peek()) === null || _a === void 0 ? void 0 : _a.value) + '`');
             }
             return expr;
         },
@@ -10595,24 +10639,21 @@
             }
             return new IndexerAtom(left, expr);
         },
-        precedence: 2 /* Precedence.Indexer */,
+        precedence: 2 /* OperatorPrecedence.Indexer */,
     };
     const FUNCTION_CALL_PARSELET = {
         parse(parser, left) {
             if (!(left instanceof SymbolAtom)) {
                 throw new Error('Unexpected parentheses');
             }
-            if (!(left.name in functions)) {
-                throw new Error('Unrecognized function: ' + left.name);
-            }
             const args = [];
             while (!parser.match(')')) {
                 args.push(parser.consumeAndParse());
                 parser.match(',');
             }
-            return new FunctionAtom(left.name, args, functions[left.name]);
+            return new FunctionAtom(left.name, args); //, functions[left.name]);
         },
-        precedence: 0 /* Precedence.FunctionCall */,
+        precedence: 0 /* OperatorPrecedence.FunctionCall */,
     };
     function parseQuantity(str) {
         const parts = str.split(' ');
@@ -10647,32 +10688,32 @@
             .registerPrefix('(', PARENTHESES_PARSELET)
             .registerInfix('[', INDEXER_PARSELET)
             .registerInfix('(', FUNCTION_CALL_PARSELET)
-            .prefix('+', 3 /* Precedence.UnaryAdd */, (_, right) => new UnaryOperatorAtom(right, (x) => x))
-            .prefix('-', 3 /* Precedence.UnarySubtract */, (_, right) => new ArithemticOperatorAtom(right, right, (_, y) => -y))
-            .infixLeft('.', 1 /* Precedence.Dot */, (left, _, right) => new DotAtom(left, right))
-            .infixLeft('/', 4 /* Precedence.Divide */, (left, _, right) => new ArithemticOperatorAtom(left, right, (x, y) => x / y))
-            .infixLeft('*', 4 /* Precedence.Multiply */, (left, _, right) => new ArithemticOperatorAtom(left, right, (x, y) => x * y))
-            .infixLeft('+', 5 /* Precedence.Add */, (left, _, right) => new ArithemticOperatorAtom(left, right, (x, y) => x + y))
-            .infixLeft('-', 5 /* Precedence.Subtract */, (left, _, right) => new ArithemticOperatorAtom(left, right, (x, y) => x - y))
-            .infixLeft('|', 7 /* Precedence.Union */, (left, _, right) => new UnionAtom(left, right))
-            .infixLeft('=', 9 /* Precedence.Equals */, (left, _, right) => new EqualsAtom(left, right))
-            .infixLeft('!=', 9 /* Precedence.Equals */, (left, _, right) => new NotEqualsAtom(left, right))
-            .infixLeft('~', 9 /* Precedence.Equivalent */, (left, _, right) => new EquivalentAtom(left, right))
-            .infixLeft('!~', 9 /* Precedence.NotEquivalent */, (left, _, right) => new NotEquivalentAtom(left, right))
-            .infixLeft('<', 8 /* Precedence.LessThan */, (left, _, right) => new ArithemticOperatorAtom(left, right, (x, y) => x < y))
-            .infixLeft('<=', 8 /* Precedence.LessThanOrEquals */, (left, _, right) => new ArithemticOperatorAtom(left, right, (x, y) => x <= y))
-            .infixLeft('>', 8 /* Precedence.GreaterThan */, (left, _, right) => new ArithemticOperatorAtom(left, right, (x, y) => x > y))
-            .infixLeft('>=', 8 /* Precedence.GreaterThanOrEquals */, (left, _, right) => new ArithemticOperatorAtom(left, right, (x, y) => x >= y))
-            .infixLeft('&', 5 /* Precedence.Ampersand */, (left, _, right) => new ConcatAtom(left, right))
-            .infixLeft('and', 6 /* Precedence.Is */, (left, _, right) => new AndAtom(left, right))
-            .infixLeft('as', 6 /* Precedence.Is */, (left, _, right) => new AsAtom(left, right))
-            .infixLeft('contains', 6 /* Precedence.Is */, (left, _, right) => new ContainsAtom(left, right))
-            .infixLeft('div', 6 /* Precedence.Is */, (left, _, right) => new ArithemticOperatorAtom(left, right, (x, y) => (x / y) | 0))
-            .infixLeft('in', 6 /* Precedence.Is */, (left, _, right) => new InAtom(left, right))
-            .infixLeft('is', 6 /* Precedence.Is */, (left, _, right) => new IsAtom(left, right))
-            .infixLeft('mod', 6 /* Precedence.Is */, (left, _, right) => new ArithemticOperatorAtom(left, right, (x, y) => x % y))
-            .infixLeft('or', 6 /* Precedence.Is */, (left, _, right) => new OrAtom(left, right))
-            .infixLeft('xor', 6 /* Precedence.Is */, (left, _, right) => new XorAtom(left, right));
+            .prefix('+', 3 /* OperatorPrecedence.UnaryAdd */, (_, right) => new UnaryOperatorAtom('+', right, (x) => x))
+            .prefix('-', 3 /* OperatorPrecedence.UnarySubtract */, (_, right) => new ArithemticOperatorAtom('-', right, right, (_, y) => -y))
+            .infixLeft('.', 1 /* OperatorPrecedence.Dot */, (left, _, right) => new DotAtom(left, right))
+            .infixLeft('/', 4 /* OperatorPrecedence.Divide */, (left, _, right) => new ArithemticOperatorAtom('/', left, right, (x, y) => x / y))
+            .infixLeft('*', 4 /* OperatorPrecedence.Multiply */, (left, _, right) => new ArithemticOperatorAtom('*', left, right, (x, y) => x * y))
+            .infixLeft('+', 5 /* OperatorPrecedence.Add */, (left, _, right) => new ArithemticOperatorAtom('+', left, right, (x, y) => x + y))
+            .infixLeft('-', 5 /* OperatorPrecedence.Subtract */, (left, _, right) => new ArithemticOperatorAtom('-', left, right, (x, y) => x - y))
+            .infixLeft('|', 7 /* OperatorPrecedence.Union */, (left, _, right) => new UnionAtom(left, right))
+            .infixLeft('=', 9 /* OperatorPrecedence.Equals */, (left, _, right) => new EqualsAtom(left, right))
+            .infixLeft('!=', 9 /* OperatorPrecedence.Equals */, (left, _, right) => new NotEqualsAtom(left, right))
+            .infixLeft('~', 9 /* OperatorPrecedence.Equivalent */, (left, _, right) => new EquivalentAtom(left, right))
+            .infixLeft('!~', 9 /* OperatorPrecedence.NotEquivalent */, (left, _, right) => new NotEquivalentAtom(left, right))
+            .infixLeft('<', 8 /* OperatorPrecedence.LessThan */, (left, _, right) => new ArithemticOperatorAtom('<', left, right, (x, y) => x < y))
+            .infixLeft('<=', 8 /* OperatorPrecedence.LessThanOrEquals */, (left, _, right) => new ArithemticOperatorAtom('<=', left, right, (x, y) => x <= y))
+            .infixLeft('>', 8 /* OperatorPrecedence.GreaterThan */, (left, _, right) => new ArithemticOperatorAtom('>', left, right, (x, y) => x > y))
+            .infixLeft('>=', 8 /* OperatorPrecedence.GreaterThanOrEquals */, (left, _, right) => new ArithemticOperatorAtom('>=', left, right, (x, y) => x >= y))
+            .infixLeft('&', 5 /* OperatorPrecedence.Ampersand */, (left, _, right) => new ConcatAtom(left, right))
+            .infixLeft('and', 6 /* OperatorPrecedence.Is */, (left, _, right) => new AndAtom(left, right))
+            .infixLeft('as', 6 /* OperatorPrecedence.Is */, (left, _, right) => new AsAtom(left, right))
+            .infixLeft('contains', 6 /* OperatorPrecedence.Is */, (left, _, right) => new ContainsAtom(left, right))
+            .infixLeft('div', 6 /* OperatorPrecedence.Is */, (left, _, right) => new ArithemticOperatorAtom('div', left, right, (x, y) => (x / y) | 0))
+            .infixLeft('in', 6 /* OperatorPrecedence.Is */, (left, _, right) => new InAtom(left, right))
+            .infixLeft('is', 6 /* OperatorPrecedence.Is */, (left, _, right) => new IsAtom(left, right))
+            .infixLeft('mod', 6 /* OperatorPrecedence.Is */, (left, _, right) => new ArithemticOperatorAtom('mod', left, right, (x, y) => x % y))
+            .infixLeft('or', 6 /* OperatorPrecedence.Is */, (left, _, right) => new OrAtom(left, right))
+            .infixLeft('xor', 6 /* OperatorPrecedence.Is */, (left, _, right) => new XorAtom(left, right));
     }
     const fhirPathParserBuilder = initFhirPathParserBuilder();
     /**