@medplum/core 0.9.34 → 0.9.36

package/dist/cjs/index.js

@@ -6087,17 +6087,16 @@
         for (const entry of bundle.entry) {
             const resource = entry.resource;
             if (resource.resourceType === 'StructureDefinition') {
-                indexStructureDefinition(globalSchema, resource);
+                indexStructureDefinition(resource);
             }
         }
     }
     /**
      * Indexes a StructureDefinition for fast lookup.
      * See comments on IndexedStructureDefinition for more details.
-     * @param schema The output IndexedStructureDefinition.
      * @param structureDefinition The original StructureDefinition.
      */
-    function indexStructureDefinition(schema, structureDefinition) {
+    function indexStructureDefinition(structureDefinition) {
         var _a;
         const typeName = structureDefinition.name;
         if (!typeName) {
@@ -6106,9 +6105,9 @@
         const elements = (_a = structureDefinition.snapshot) === null || _a === void 0 ? void 0 : _a.element;
         if (elements) {
             // First pass, build types
-            elements.forEach((element) => indexType(schema, structureDefinition, element));
+            elements.forEach((element) => indexType(structureDefinition, element));
             // Second pass, build properties
-            elements.forEach((element) => indexProperty(schema, element));
+            elements.forEach((element) => indexProperty(element));
         }
     }
     /**
@@ -6118,7 +6117,7 @@
      * @param schema The output IndexedStructureDefinition.
      * @param element The input ElementDefinition.
      */
-    function indexType(schema, structureDefinition, elementDefinition) {
+    function indexType(structureDefinition, elementDefinition) {
         var _a, _b;
         const path = elementDefinition.path;
         const typeCode = (_b = (_a = elementDefinition.type) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.code;
@@ -6127,22 +6126,22 @@
         }
         const parts = path.split('.');
         const typeName = buildTypeName(parts);
-        schema.types[typeName] = createTypeSchema(typeName, structureDefinition, elementDefinition);
-        schema.types[typeName].parentType = buildTypeName(parts.slice(0, parts.length - 1));
+        globalSchema.types[typeName] = createTypeSchema(typeName, structureDefinition, elementDefinition);
+        globalSchema.types[typeName].parentType = buildTypeName(parts.slice(0, parts.length - 1));
     }
     /**
      * Indexes PropertySchema from an ElementDefinition.
      * @param schema The output IndexedStructureDefinition.
      * @param element The input ElementDefinition.
      */
-    function indexProperty(schema, element) {
+    function indexProperty(element) {
         const path = element.path;
         const parts = path.split('.');
         if (parts.length === 1) {
             return;
         }
         const typeName = buildTypeName(parts.slice(0, parts.length - 1));
-        const typeSchema = schema.types[typeName];
+        const typeSchema = globalSchema.types[typeName];
         if (!typeSchema) {
             return;
         }
@@ -6155,17 +6154,23 @@
      * @param schema The output IndexedStructureDefinition.
      * @param searchParam The SearchParameter resource.
      */
-    function indexSearchParameter(schema, searchParam) {
+    function indexSearchParameter(searchParam) {
         if (!searchParam.base) {
             return;
         }
         for (const resourceType of searchParam.base) {
-            const typeSchema = schema.types[resourceType];
+            const typeSchema = globalSchema.types[resourceType];
             if (!typeSchema) {
                 continue;
             }
             if (!typeSchema.searchParams) {
                 typeSchema.searchParams = {
+                    _id: {
+                        base: [resourceType],
+                        code: '_id',
+                        type: 'token',
+                        expression: resourceType + '.id',
+                    },
                     _lastUpdated: {
                         base: [resourceType],
                         code: '_lastUpdated',
@@ -6205,6 +6210,33 @@
             .replace('_', ' ')
             .replace(/\s+/g, ' ');
     }
+    /**
+     * Returns an element definition by type and property name.
+     * Handles content references.
+     * @param typeName The type name.
+     * @param propertyName The property name.
+     * @returns The element definition if found.
+     */
+    function getElementDefinition(typeName, propertyName) {
+        var _a;
+        const typeSchema = globalSchema.types[typeName];
+        if (!typeSchema) {
+            return undefined;
+        }
+        const property = (_a = typeSchema.properties[propertyName]) !== null && _a !== void 0 ? _a : typeSchema.properties[propertyName + '[x]'];
+        if (!property) {
+            return undefined;
+        }
+        if (property.contentReference) {
+            // Content references start with a "#"
+            // Remove the "#" character
+            const contentReference = property.contentReference.substring(1).split('.');
+            const referencePropertyName = contentReference.pop();
+            const referenceTypeName = buildTypeName(contentReference);
+            return getElementDefinition(referenceTypeName, referencePropertyName);
+        }
+        return property;
+    }
     /**
      * Global schema singleton.
      */
@@ -6212,7 +6244,7 @@
 
     // 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_startPkce, _MedplumClient_requestAuthorization, _MedplumClient_refresh, _MedplumClient_fetchTokens, _MedplumClient_verifyTokens, _MedplumClient_setupStorageListener;
+    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 DEFAULT_BASE_URL = 'https://api.medplum.com/';
     const DEFAULT_SCOPE = 'launch/patient openid fhirUser offline_access user/*.*';
     const DEFAULT_RESOURCE_CACHE_SIZE = 1000;
@@ -6481,8 +6513,8 @@
          */
         startNewUser(newUserRequest) {
             return __awaiter(this, void 0, void 0, function* () {
-                yield __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_startPkce).call(this);
-                return this.post('auth/newuser', Object.assign(Object.assign({}, newUserRequest), { codeChallengeMethod: 'S256', codeChallenge: __classPrivateFieldGet(this, _MedplumClient_storage, "f").getString('codeChallenge') }));
+                yield this.startPkce();
+                return this.post('auth/newuser', Object.assign(Object.assign({}, newUserRequest), { codeChallengeMethod: 'S256', codeChallenge: sessionStorage.getItem('codeChallenge') }));
             });
         }
         /**
@@ -6520,10 +6552,9 @@
         startLogin(loginRequest) {
             var _a, _b;
             return __awaiter(this, void 0, void 0, function* () {
-                if (!loginRequest.codeChallenge || !loginRequest.codeChallengeMethod) {
-                    yield __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_startPkce).call(this);
-                }
-                return this.post('auth/login', Object.assign(Object.assign({}, loginRequest), { clientId: (_a = loginRequest.clientId) !== null && _a !== void 0 ? _a : __classPrivateFieldGet(this, _MedplumClient_clientId, "f"), scope: (_b = loginRequest.scope) !== null && _b !== void 0 ? _b : DEFAULT_SCOPE, codeChallengeMethod: loginRequest.codeChallengeMethod || 'S256', codeChallenge: loginRequest.codeChallenge || __classPrivateFieldGet(this, _MedplumClient_storage, "f").getString('codeChallenge') }));
+                const { codeChallenge, codeChallengeMethod } = this.getCodeChallenge(loginRequest);
+                return this.post('auth/login', Object.assign(Object.assign({}, loginRequest), { clientId: (_a = loginRequest.clientId) !== null && _a !== void 0 ? _a : __classPrivateFieldGet(this, _MedplumClient_clientId, "f"), scope: (_b = loginRequest.scope) !== null && _b !== void 0 ? _b : DEFAULT_SCOPE, codeChallengeMethod,
+                    codeChallenge }));
             });
         }
         /**
@@ -6537,12 +6568,27 @@
         startGoogleLogin(loginRequest) {
             var _a, _b;
             return __awaiter(this, void 0, void 0, function* () {
-                if (!loginRequest.codeChallenge || !loginRequest.codeChallengeMethod) {
-                    yield __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_startPkce).call(this);
-                }
-                return this.post('auth/google', Object.assign(Object.assign({}, loginRequest), { clientId: (_a = loginRequest.clientId) !== null && _a !== void 0 ? _a : __classPrivateFieldGet(this, _MedplumClient_clientId, "f"), scope: (_b = loginRequest.scope) !== null && _b !== void 0 ? _b : DEFAULT_SCOPE, codeChallengeMethod: loginRequest.codeChallengeMethod || 'S256', codeChallenge: loginRequest.codeChallenge || __classPrivateFieldGet(this, _MedplumClient_storage, "f").getString('codeChallenge') }));
+                const { codeChallenge, codeChallengeMethod } = this.getCodeChallenge(loginRequest);
+                return this.post('auth/google', Object.assign(Object.assign({}, loginRequest), { clientId: (_a = loginRequest.clientId) !== null && _a !== void 0 ? _a : __classPrivateFieldGet(this, _MedplumClient_clientId, "f"), scope: (_b = loginRequest.scope) !== null && _b !== void 0 ? _b : DEFAULT_SCOPE, codeChallengeMethod,
+                    codeChallenge }));
             });
         }
+        getCodeChallenge(loginRequest) {
+            if (loginRequest.codeChallenge) {
+                return {
+                    codeChallenge: loginRequest.codeChallenge,
+                    codeChallengeMethod: loginRequest.codeChallengeMethod,
+                };
+            }
+            const codeChallenge = sessionStorage.getItem('codeChallenge');
+            if (codeChallenge) {
+                return {
+                    codeChallenge,
+                    codeChallengeMethod: 'S256',
+                };
+            }
+            return {};
+        }
         /**
          * Signs out locally.
          * Does not invalidate tokens with the server.
@@ -6617,7 +6663,7 @@
          * ```json
          * {
          *    "resourceType": "Bundle",
-         *    "type": "searchest",
+         *    "type": "searchset",
          *    "total": 1,
          *    "entry": [
          *       {
@@ -6772,8 +6818,8 @@
          * @param id The resource ID.
          * @returns The resource if available; undefined otherwise.
          */
-        readResource(resourceType, id) {
-            return this.get(this.fhirUrl(resourceType, id));
+        readResource(resourceType, id, options = {}) {
+            return this.get(this.fhirUrl(resourceType, id), options);
         }
         /**
          * Reads a resource by `Reference`.
@@ -6794,7 +6840,7 @@
          * @param reference The FHIR reference object.
          * @returns The resource if available; undefined otherwise.
          */
-        readReference(reference) {
+        readReference(reference, options = {}) {
             const refString = reference === null || reference === void 0 ? void 0 : reference.reference;
             if (!refString) {
                 return new ReadablePromise(Promise.reject(new Error('Missing reference')));
@@ -6803,7 +6849,7 @@
             if (!resourceType || !id) {
                 return new ReadablePromise(Promise.reject(new Error('Invalid reference')));
             }
-            return this.readResource(resourceType, id);
+            return this.readResource(resourceType, id, options);
         }
         /**
          * Returns a cached schema for a resource type.
@@ -6860,10 +6906,10 @@
     }`.replace(/\s+/g, ' ');
                 const response = (yield this.graphql(query));
                 for (const structureDefinition of response.data.StructureDefinitionList) {
-                    indexStructureDefinition(globalSchema, structureDefinition);
+                    indexStructureDefinition(structureDefinition);
                 }
                 for (const searchParameter of response.data.SearchParameterList) {
-                    indexSearchParameter(globalSchema, searchParameter);
+                    indexSearchParameter(searchParameter);
                 }
                 return globalSchema;
             });
@@ -6887,8 +6933,8 @@
          * @param id The resource ID.
          * @returns Promise to the resource history.
          */
-        readHistory(resourceType, id) {
-            return this.get(this.fhirUrl(resourceType, id, '_history'));
+        readHistory(resourceType, id, options = {}) {
+            return this.get(this.fhirUrl(resourceType, id, '_history'), options);
         }
         /**
          * Reads a specific version of a resource by resource type, ID, and version ID.
@@ -6907,8 +6953,8 @@
          * @param id The resource ID.
          * @returns The resource if available; undefined otherwise.
          */
-        readVersion(resourceType, id, vid) {
-            return this.get(this.fhirUrl(resourceType, id, '_history', vid));
+        readVersion(resourceType, id, vid, options = {}) {
+            return this.get(this.fhirUrl(resourceType, id, '_history', vid), options);
         }
         /**
          *
@@ -6916,8 +6962,8 @@
          * @param id The Patient Id
          * @returns A Bundle of all Resources related to the Patient
          */
-        readPatientEverything(id) {
-            return this.get(this.fhirUrl('Patient', id, '$everything'));
+        readPatientEverything(id, options = {}) {
+            return this.get(this.fhirUrl('Patient', id, '$everything'), options);
         }
         /**
          * Creates a new FHIR resource.
@@ -7427,28 +7473,36 @@
                 return response.blob();
             });
         }
+        /**
+         * Starts a new PKCE flow.
+         * These PKCE values are stateful, and must survive redirects and page refreshes.
+         */
+        startPkce() {
+            return __awaiter(this, void 0, void 0, function* () {
+                const pkceState = getRandomString();
+                sessionStorage.setItem('pkceState', pkceState);
+                const codeVerifier = getRandomString();
+                sessionStorage.setItem('codeVerifier', codeVerifier);
+                const arrayHash = yield encryptSHA256(codeVerifier);
+                const codeChallenge = arrayBufferToBase64(arrayHash).replace(/\+/g, '-').replace(/\//g, '_').replace(/=/g, '');
+                sessionStorage.setItem('codeChallenge', codeChallenge);
+            });
+        }
         /**
          * Processes an OAuth authorization code.
          * See: https://openid.net/specs/openid-connect-core-1_0.html#TokenRequest
          * @param code The authorization code received by URL parameter.
          */
         processCode(code) {
-            const pkceState = __classPrivateFieldGet(this, _MedplumClient_storage, "f").getString('pkceState');
-            if (!pkceState) {
-                this.clear();
-                throw new Error('Invalid PCKE state');
-            }
-            const codeVerifier = __classPrivateFieldGet(this, _MedplumClient_storage, "f").getString('codeVerifier');
-            if (!codeVerifier) {
-                this.clear();
-                throw new Error('Invalid PCKE code verifier');
-            }
             const formBody = new URLSearchParams();
             formBody.set('grant_type', 'authorization_code');
             formBody.set('client_id', __classPrivateFieldGet(this, _MedplumClient_clientId, "f"));
-            formBody.set('code_verifier', codeVerifier);
             formBody.set('code', code);
             formBody.set('redirect_uri', getBaseUrl());
+            const codeVerifier = sessionStorage.getItem('codeVerifier');
+            if (codeVerifier) {
+                formBody.set('code_verifier', codeVerifier);
+            }
             return __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_fetchTokens).call(this, formBody);
         }
         /**
@@ -7531,6 +7585,7 @@
             options.headers = {};
         }
         const headers = options.headers;
+        headers['X-Medplum'] = 'extended';
         if (!headers['Content-Type']) {
             headers['Content-Type'] = FHIR_CONTENT_TYPE;
         }
@@ -7571,27 +7626,17 @@
                 return Promise.reject(error);
             });
         });
-    }, _MedplumClient_startPkce = function _MedplumClient_startPkce() {
-        return __awaiter(this, void 0, void 0, function* () {
-            const pkceState = getRandomString();
-            __classPrivateFieldGet(this, _MedplumClient_storage, "f").setString('pkceState', pkceState);
-            const codeVerifier = getRandomString();
-            __classPrivateFieldGet(this, _MedplumClient_storage, "f").setString('codeVerifier', codeVerifier);
-            const arrayHash = yield encryptSHA256(codeVerifier);
-            const codeChallenge = arrayBufferToBase64(arrayHash).replace(/\+/g, '-').replace(/\//g, '_').replace(/=/g, '');
-            __classPrivateFieldGet(this, _MedplumClient_storage, "f").setString('codeChallenge', codeChallenge);
-        });
     }, _MedplumClient_requestAuthorization = function _MedplumClient_requestAuthorization() {
         return __awaiter(this, void 0, void 0, function* () {
-            yield __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_startPkce).call(this);
+            yield this.startPkce();
             const url = new URL(__classPrivateFieldGet(this, _MedplumClient_authorizeUrl, "f"));
             url.searchParams.set('response_type', 'code');
-            url.searchParams.set('state', __classPrivateFieldGet(this, _MedplumClient_storage, "f").getString('pkceState'));
+            url.searchParams.set('state', sessionStorage.getItem('pkceState'));
             url.searchParams.set('client_id', __classPrivateFieldGet(this, _MedplumClient_clientId, "f"));
             url.searchParams.set('redirect_uri', getBaseUrl());
             url.searchParams.set('scope', DEFAULT_SCOPE);
             url.searchParams.set('code_challenge_method', 'S256');
-            url.searchParams.set('code_challenge', __classPrivateFieldGet(this, _MedplumClient_storage, "f").getString('codeChallenge'));
+            url.searchParams.set('code_challenge', sessionStorage.getItem('codeChallenge'));
             window.location.assign(url.toString());
         });
     }, _MedplumClient_refresh = function _MedplumClient_refresh() {
@@ -7616,6 +7661,7 @@
                 method: 'POST',
                 headers: { 'Content-Type': 'application/x-www-form-urlencoded' },
                 body: formBody,
+                credentials: 'include',
             })
                 .then((response) => {
                 if (!response.ok) {
@@ -7761,9 +7807,9 @@
         if (!(input === null || input === void 0 ? void 0 : input.value)) {
             return undefined;
         }
-        const typeSchema = globalSchema.types[input.type];
-        if (typeSchema) {
-            const typedResult = getTypedPropertyValueWithSchema(input, path, typeSchema);
+        const elementDefinition = getElementDefinition(input.type, path);
+        if (elementDefinition) {
+            const typedResult = getTypedPropertyValueWithSchema(input, path, elementDefinition);
             if (typedResult) {
                 return typedResult;
             }
@@ -7774,24 +7820,18 @@
      * 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 typeSchema The input type schema.
+     * @param property The property element definition.
      * @returns The value of the property and the property type.
      */
-    function getTypedPropertyValueWithSchema(input, path, typeSchema) {
+    function getTypedPropertyValueWithSchema(input, path, property) {
         var _a;
-        const property = (_a = typeSchema.properties[path]) !== null && _a !== void 0 ? _a : typeSchema.properties[path + '[x]'];
-        if (!property) {
-            return undefined;
-        }
         const types = property.type;
         if (!types || types.length === 0) {
             return undefined;
         }
-        let propertyName = undefined;
         let resultValue = undefined;
         let resultType = 'undefined';
         if (types.length === 1) {
-            propertyName = path;
             resultValue = input.value[path];
             resultType = types[0].code;
         }
@@ -7799,7 +7839,6 @@
             for (const type of types) {
                 const path2 = path.replace('[x]', '') + capitalize(type.code);
                 if (path2 in input.value) {
-                    propertyName = path2;
                     resultValue = input.value[path2];
                     resultType = type.code;
                     break;
@@ -7809,16 +7848,22 @@
         if (isEmpty(resultValue)) {
             return undefined;
         }
-        if (resultType === 'BackboneElement') {
-            resultType = buildTypeName([input.type, propertyName]);
+        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) => ({ value: element, type: resultType }));
+            return resultValue.map((element) => toTypedValueWithType(element, resultType));
         }
         else {
-            return { value: resultValue, type: resultType };
+            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.
@@ -9893,10 +9938,108 @@
         }
     }
 
-    var _Tokenizer_instances, _Tokenizer_str, _Tokenizer_pos, _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;
-    function tokenize(str) {
-        return new Tokenizer(str).tokenize();
+    var _ParserBuilder_prefixParselets, _ParserBuilder_infixParselets, _Parser_tokens, _Parser_prefixParselets, _Parser_infixParselets;
+    class ParserBuilder {
+        constructor() {
+            _ParserBuilder_prefixParselets.set(this, {});
+            _ParserBuilder_infixParselets.set(this, {});
+        }
+        registerInfix(tokenType, parselet) {
+            __classPrivateFieldGet(this, _ParserBuilder_infixParselets, "f")[tokenType] = parselet;
+            return this;
+        }
+        registerPrefix(tokenType, parselet) {
+            __classPrivateFieldGet(this, _ParserBuilder_prefixParselets, "f")[tokenType] = parselet;
+            return this;
+        }
+        prefix(tokenType, precedence, builder) {
+            return this.registerPrefix(tokenType, {
+                parse(parser, token) {
+                    const right = parser.consumeAndParse(precedence);
+                    return builder(token, right);
+                },
+            });
+        }
+        infixLeft(tokenType, precedence, builder) {
+            return this.registerInfix(tokenType, {
+                parse(parser, left, token) {
+                    const right = parser.consumeAndParse(precedence);
+                    return builder(left, token, right);
+                },
+                precedence,
+            });
+        }
+        construct(input) {
+            return new Parser(input, __classPrivateFieldGet(this, _ParserBuilder_prefixParselets, "f"), __classPrivateFieldGet(this, _ParserBuilder_infixParselets, "f"));
+        }
     }
+    _ParserBuilder_prefixParselets = new WeakMap(), _ParserBuilder_infixParselets = new WeakMap();
+    class Parser {
+        constructor(tokens, prefixParselets, infixParselets) {
+            _Parser_tokens.set(this, void 0);
+            _Parser_prefixParselets.set(this, void 0);
+            _Parser_infixParselets.set(this, void 0);
+            __classPrivateFieldSet(this, _Parser_tokens, tokens, "f");
+            __classPrivateFieldSet(this, _Parser_prefixParselets, prefixParselets, "f");
+            __classPrivateFieldSet(this, _Parser_infixParselets, infixParselets, "f");
+        }
+        hasMore() {
+            return __classPrivateFieldGet(this, _Parser_tokens, "f").length > 0;
+        }
+        match(expected) {
+            const token = this.peek();
+            if ((token === null || token === void 0 ? void 0 : token.id) !== expected) {
+                return false;
+            }
+            this.consume();
+            return true;
+        }
+        consumeAndParse(precedence = Infinity) {
+            const token = this.consume();
+            const prefix = __classPrivateFieldGet(this, _Parser_prefixParselets, "f")[token.id];
+            if (!prefix) {
+                throw Error(`Parse error at "${token.value}" (line ${token.line}, column ${token.column}). No matching prefix parselet.`);
+            }
+            let left = prefix.parse(this, token);
+            while (precedence > this.getPrecedence()) {
+                const next = this.consume();
+                const infix = __classPrivateFieldGet(this, _Parser_infixParselets, "f")[next.id];
+                left = infix.parse(this, left, next);
+            }
+            return left;
+        }
+        getPrecedence() {
+            const nextToken = this.peek();
+            if (!nextToken) {
+                return Infinity;
+            }
+            const parser = __classPrivateFieldGet(this, _Parser_infixParselets, "f")[nextToken.id];
+            if (parser) {
+                return parser.precedence;
+            }
+            return Infinity;
+        }
+        consume(expected) {
+            var _a;
+            if (!__classPrivateFieldGet(this, _Parser_tokens, "f").length) {
+                throw Error('Cant consume unknown more tokens.');
+            }
+            if (expected && ((_a = this.peek()) === null || _a === void 0 ? void 0 : _a.id) !== expected) {
+                const actual = this.peek();
+                throw Error(`Expected ${expected} but got "${actual.value}" at line ${actual.line} column ${actual.column}.`);
+            }
+            return __classPrivateFieldGet(this, _Parser_tokens, "f").shift();
+        }
+        peek() {
+            return __classPrivateFieldGet(this, _Parser_tokens, "f").length > 0 ? __classPrivateFieldGet(this, _Parser_tokens, "f")[0] : undefined;
+        }
+        removeComments() {
+            __classPrivateFieldSet(this, _Parser_tokens, __classPrivateFieldGet(this, _Parser_tokens, "f").filter((t) => t.id !== 'Comment'), "f");
+        }
+    }
+    _Parser_tokens = new WeakMap(), _Parser_prefixParselets = new WeakMap(), _Parser_infixParselets = new WeakMap();
+
+    var _Tokenizer_instances, _Tokenizer_str, _Tokenizer_keywords, _Tokenizer_operators, _Tokenizer_result, _Tokenizer_pos, _Tokenizer_markStack, _Tokenizer_prevToken, _Tokenizer_peekToken, _Tokenizer_consumeToken, _Tokenizer_consumeWhitespace, _Tokenizer_consumeMultiLineComment, _Tokenizer_consumeSingleLineComment, _Tokenizer_consumeString, _Tokenizer_consumeBacktickSymbol, _Tokenizer_consumeDateTime, _Tokenizer_consumeNumber, _Tokenizer_consumeSymbol, _Tokenizer_consumeOperator, _Tokenizer_consumeWhile, _Tokenizer_curr, _Tokenizer_prev, _Tokenizer_peek, _Tokenizer_mark, _Tokenizer_reset, _Tokenizer_advance, _Tokenizer_buildToken;
     const STANDARD_UNITS = [
         'year',
         'years',
@@ -9915,30 +10058,35 @@
         'millisecond',
         'milliseconds',
     ];
-    const TWO_CHAR_OPERATORS = ['!=', '!~', '<=', '>=', '{}'];
     class Tokenizer {
-        constructor(str) {
+        constructor(str, keywords, operators) {
             _Tokenizer_instances.add(this);
             _Tokenizer_str.set(this, void 0);
-            _Tokenizer_pos.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_pos, 0, "f");
+            __classPrivateFieldSet(this, _Tokenizer_keywords, keywords, "f");
+            __classPrivateFieldSet(this, _Tokenizer_operators, operators, "f");
         }
         tokenize() {
-            const result = [];
-            while (__classPrivateFieldGet(this, _Tokenizer_pos, "f") < __classPrivateFieldGet(this, _Tokenizer_str, "f").length) {
+            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) {
-                    result.push(token);
+                    __classPrivateFieldGet(this, _Tokenizer_result, "f").push(token);
                 }
             }
-            return result;
+            return __classPrivateFieldGet(this, _Tokenizer_result, "f");
         }
     }
-    _Tokenizer_str = new WeakMap(), _Tokenizer_pos = new WeakMap(), _Tokenizer_instances = new WeakSet(), _Tokenizer_peekToken = function _Tokenizer_peekToken() {
-        const start = __classPrivateFieldGet(this, _Tokenizer_pos, "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);
-        __classPrivateFieldSet(this, _Tokenizer_pos, start, "f");
+        __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);
@@ -9946,6 +10094,7 @@
         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);
@@ -9953,8 +10102,8 @@
         if (c === '/' && next === '/') {
             return __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeSingleLineComment).call(this);
         }
-        if (c === "'") {
-            return __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeString).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);
@@ -9973,54 +10122,51 @@
         }
         return __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeOperator).call(this);
     }, _Tokenizer_consumeWhitespace = function _Tokenizer_consumeWhitespace() {
-        return buildToken('Whitespace', __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeWhile).call(this, () => __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this).match(/\s/)));
+        __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");
+        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) !== '/');
-        __classPrivateFieldSet(this, _Tokenizer_pos, __classPrivateFieldGet(this, _Tokenizer_pos, "f") + 2, "f");
-        return buildToken('Comment', __classPrivateFieldGet(this, _Tokenizer_str, "f").substring(start, __classPrivateFieldGet(this, _Tokenizer_pos, "f")));
+        __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 buildToken('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() {
-        var _a, _b;
-        __classPrivateFieldSet(this, _Tokenizer_pos, (_a = __classPrivateFieldGet(this, _Tokenizer_pos, "f"), _a++, _a), "f");
-        const result = buildToken('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) !== "'"));
-        __classPrivateFieldSet(this, _Tokenizer_pos, (_b = __classPrivateFieldGet(this, _Tokenizer_pos, "f"), _b++, _b), "f");
+        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() {
-        var _a, _b;
-        __classPrivateFieldSet(this, _Tokenizer_pos, (_a = __classPrivateFieldGet(this, _Tokenizer_pos, "f"), _a++, _a), "f");
-        const result = buildToken('Symbol', __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeWhile).call(this, () => __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this) !== '`'));
-        __classPrivateFieldSet(this, _Tokenizer_pos, (_b = __classPrivateFieldGet(this, _Tokenizer_pos, "f"), _b++, _b), "f");
+        __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() {
-        var _a, _b, _c, _d, _e;
-        const start = __classPrivateFieldGet(this, _Tokenizer_pos, "f");
-        __classPrivateFieldSet(this, _Tokenizer_pos, (_a = __classPrivateFieldGet(this, _Tokenizer_pos, "f"), _a++, _a), "f");
+        __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') {
-            __classPrivateFieldSet(this, _Tokenizer_pos, (_b = __classPrivateFieldGet(this, _Tokenizer_pos, "f"), _b++, _b), "f");
+            __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/)) {
-                __classPrivateFieldSet(this, _Tokenizer_pos, (_c = __classPrivateFieldGet(this, _Tokenizer_pos, "f"), _c++, _c), "f");
-                __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeWhile).call(this, () => __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).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') {
-                __classPrivateFieldSet(this, _Tokenizer_pos, (_d = __classPrivateFieldGet(this, _Tokenizer_pos, "f"), _d++, _d), "f");
+                __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) === '-') {
-                __classPrivateFieldSet(this, _Tokenizer_pos, (_e = __classPrivateFieldGet(this, _Tokenizer_pos, "f"), _e++, _e), "f");
+                __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 buildToken('DateTime', __classPrivateFieldGet(this, _Tokenizer_str, "f").substring(start + 1, __classPrivateFieldGet(this, _Tokenizer_pos, "f")));
+        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() {
-        var _a;
-        const start = __classPrivateFieldGet(this, _Tokenizer_pos, "f");
+        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/)) {
-            __classPrivateFieldSet(this, _Tokenizer_pos, (_a = __classPrivateFieldGet(this, _Tokenizer_pos, "f"), _a++, _a), "f");
+            __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) === ' ') {
@@ -10029,39 +10175,66 @@
                 __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeToken).call(this);
             }
         }
-        return buildToken(id, __classPrivateFieldGet(this, _Tokenizer_str, "f").substring(start, __classPrivateFieldGet(this, _Tokenizer_pos, "f")));
+        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() {
-        return buildToken('Symbol', __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_consumeWhile).call(this, () => __classPrivateFieldGet(this, _Tokenizer_instances, "m", _Tokenizer_curr).call(this).match(/[$\w]/)));
-    }, _Tokenizer_consumeOperator = function _Tokenizer_consumeOperator() {
         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 (TWO_CHAR_OPERATORS.includes(twoCharOp)) {
-            __classPrivateFieldSet(this, _Tokenizer_pos, __classPrivateFieldGet(this, _Tokenizer_pos, "f") + 2, "f");
-            return buildToken(twoCharOp, twoCharOp);
+        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);
         }
-        __classPrivateFieldSet(this, _Tokenizer_pos, (_a = __classPrivateFieldGet(this, _Tokenizer_pos, "f"), _a++, _a), "f");
-        return buildToken(c, c);
+        __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) {
-        var _a;
-        const start = __classPrivateFieldGet(this, _Tokenizer_pos, "f");
-        while (__classPrivateFieldGet(this, _Tokenizer_pos, "f") < __classPrivateFieldGet(this, _Tokenizer_str, "f").length && condition()) {
-            __classPrivateFieldSet(this, _Tokenizer_pos, (_a = __classPrivateFieldGet(this, _Tokenizer_pos, "f"), _a++, _a), "f");
+        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"));
+        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")];
+        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") - 1]) !== null && _a !== void 0 ? _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") + 1]) !== null && _a !== void 0 ? _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 buildToken(id, value) {
-        return { id, value };
-    }
     function isUnitToken(token) {
         if (token) {
             if (token.id === 'String') {
@@ -10074,93 +10247,12 @@
         return false;
     }
 
-    var _ParserBuilder_prefixParselets, _ParserBuilder_infixParselets, _Parser_instances, _Parser_tokens, _Parser_prefixParselets, _Parser_infixParselets, _Parser_getPrecedence, _Parser_consume, _Parser_look;
-    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(tokenize(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_instances.add(this);
-            _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");
-        }
-        match(expected) {
-            const token = __classPrivateFieldGet(this, _Parser_instances, "m", _Parser_look).call(this);
-            if ((token === null || token === void 0 ? void 0 : token.id) !== expected) {
-                return false;
-            }
-            __classPrivateFieldGet(this, _Parser_instances, "m", _Parser_consume).call(this);
-            return true;
-        }
-        consumeAndParse(precedence = 100 /* Precedence.MaximumPrecedence */) {
-            const token = __classPrivateFieldGet(this, _Parser_instances, "m", _Parser_consume).call(this);
-            const prefix = __classPrivateFieldGet(this, _Parser_prefixParselets, "f")[token.id];
-            if (!prefix) {
-                throw Error(`Parse error at ${token.value}. No matching prefix parselet.`);
-            }
-            let left = prefix.parse(this, token);
-            while (precedence > __classPrivateFieldGet(this, _Parser_instances, "m", _Parser_getPrecedence).call(this)) {
-                const next = __classPrivateFieldGet(this, _Parser_instances, "m", _Parser_consume).call(this);
-                const infix = __classPrivateFieldGet(this, _Parser_infixParselets, "f")[next.id];
-                left = infix.parse(this, left, next);
-            }
-            return left;
-        }
+    const FHIRPATH_KEYWORDS = ['true', 'false', 'and', 'as', 'contains', 'div', 'in', 'is', 'mod', 'or', 'xor'];
+    const FHIRPATH_OPERATORS = ['!=', '!~', '<=', '>=', '{}', '->'];
+    function tokenize(str) {
+        return new Tokenizer(str, FHIRPATH_KEYWORDS, FHIRPATH_OPERATORS).tokenize();
     }
-    _Parser_tokens = new WeakMap(), _Parser_prefixParselets = new WeakMap(), _Parser_infixParselets = new WeakMap(), _Parser_instances = new WeakSet(), _Parser_getPrecedence = function _Parser_getPrecedence() {
-        const nextToken = __classPrivateFieldGet(this, _Parser_instances, "m", _Parser_look).call(this);
-        if (!nextToken) {
-            return 100 /* Precedence.MaximumPrecedence */;
-        }
-        const parser = __classPrivateFieldGet(this, _Parser_infixParselets, "f")[nextToken.id];
-        if (parser) {
-            return parser.precedence;
-        }
-        return 100 /* Precedence.MaximumPrecedence */;
-    }, _Parser_consume = function _Parser_consume() {
-        if (!__classPrivateFieldGet(this, _Parser_tokens, "f").length) {
-            throw Error('Cant consume unknown more tokens.');
-        }
-        return __classPrivateFieldGet(this, _Parser_tokens, "f").shift();
-    }, _Parser_look = function _Parser_look() {
-        return __classPrivateFieldGet(this, _Parser_tokens, "f").length > 0 ? __classPrivateFieldGet(this, _Parser_tokens, "f")[0] : undefined;
-    };
+
     const PARENTHESES_PARSELET = {
         parse(parser) {
             const expr = parser.consumeAndParse();
@@ -10209,75 +10301,55 @@
         }
         return { value, unit };
     }
-    const parserBuilder = new ParserBuilder()
-        .registerPrefix('String', {
-        parse: (_, token) => new LiteralAtom({ type: exports.PropertyType.string, value: token.value }),
-    })
-        .registerPrefix('DateTime', {
-        parse: (_, token) => new LiteralAtom({ type: exports.PropertyType.dateTime, value: parseDateString(token.value) }),
-    })
-        .registerPrefix('Quantity', {
-        parse: (_, token) => new LiteralAtom({ type: exports.PropertyType.Quantity, value: parseQuantity(token.value) }),
-    })
-        .registerPrefix('Number', {
-        parse: (_, token) => new LiteralAtom({ type: exports.PropertyType.decimal, value: parseFloat(token.value) }),
-    })
-        .registerPrefix('Symbol', {
-        parse: (_, token) => {
-            if (token.value === 'false') {
-                return new LiteralAtom({ type: exports.PropertyType.boolean, value: false });
-            }
-            if (token.value === 'true') {
-                return new LiteralAtom({ type: exports.PropertyType.boolean, value: true });
-            }
-            return new SymbolAtom(token.value);
-        },
-    })
-        .registerPrefix('{}', { parse: () => new EmptySetAtom() })
-        .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('Symbol', 6 /* Precedence.Is */, (left, symbol, right) => {
-        switch (symbol.value) {
-            case 'and':
-                return new AndAtom(left, right);
-            case 'as':
-                return new AsAtom(left, right);
-            case 'contains':
-                return new ContainsAtom(left, right);
-            case 'div':
-                return new ArithemticOperatorAtom(left, right, (x, y) => (x / y) | 0);
-            case 'in':
-                return new InAtom(left, right);
-            case 'is':
-                return new IsAtom(left, right);
-            case 'mod':
-                return new ArithemticOperatorAtom(left, right, (x, y) => x % y);
-            case 'or':
-                return new OrAtom(left, right);
-            case 'xor':
-                return new XorAtom(left, right);
-            default:
-                throw new Error('Cannot use ' + symbol.value + ' as infix operator');
-        }
-    });
+    function initFhirPathParserBuilder() {
+        return new ParserBuilder()
+            .registerPrefix('String', {
+            parse: (_, token) => new LiteralAtom({ type: exports.PropertyType.string, value: token.value }),
+        })
+            .registerPrefix('DateTime', {
+            parse: (_, token) => new LiteralAtom({ type: exports.PropertyType.dateTime, value: parseDateString(token.value) }),
+        })
+            .registerPrefix('Quantity', {
+            parse: (_, token) => new LiteralAtom({ type: exports.PropertyType.Quantity, value: parseQuantity(token.value) }),
+        })
+            .registerPrefix('Number', {
+            parse: (_, token) => new LiteralAtom({ type: exports.PropertyType.decimal, value: parseFloat(token.value) }),
+        })
+            .registerPrefix('true', { parse: () => new LiteralAtom({ type: exports.PropertyType.boolean, value: true }) })
+            .registerPrefix('false', { parse: () => new LiteralAtom({ type: exports.PropertyType.boolean, value: false }) })
+            .registerPrefix('Symbol', { parse: (_, token) => new SymbolAtom(token.value) })
+            .registerPrefix('{}', { parse: () => new EmptySetAtom() })
+            .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));
+    }
+    const fhirPathParserBuilder = initFhirPathParserBuilder();
     /**
      * Parses a FHIRPath expression into an AST.
      * The result can be used to evaluate the expression against a resource or other object.
@@ -10287,17 +10359,12 @@
      * @returns The AST representing the expression.
      */
     function parseFhirPath(input) {
-        try {
-            return new FhirPathAtom(input, parserBuilder.construct(input).consumeAndParse());
-        }
-        catch (error) {
-            throw new Error(`FhirPathError on "${input}": ${error}`);
-        }
+        return new FhirPathAtom(input, fhirPathParserBuilder.construct(tokenize(input)).consumeAndParse());
     }
     /**
      * Evaluates a FHIRPath expression against a resource or other object.
-     * @param input The FHIRPath expression to parse.
-     * @param context The resource or object to evaluate the expression against.
+     * @param expression The FHIRPath expression to parse.
+     * @param input The resource or object to evaluate the expression against.
      * @returns The result of the FHIRPath expression against the resource or object.
      */
     function evalFhirPath(expression, input) {
@@ -10314,8 +10381,8 @@
     }
     /**
      * Evaluates a FHIRPath expression against a resource or other object.
-     * @param input The FHIRPath expression to parse.
-     * @param context The resource or object to evaluate the expression against.
+     * @param expression The FHIRPath expression to parse.
+     * @param input The resource or object to evaluate the expression against.
      * @returns The result of the FHIRPath expression against the resource or object.
      */
     function evalFhirPathTyped(expression, input) {
@@ -10443,7 +10510,7 @@
         issue: [
             {
                 severity: 'information',
-                code: 'information',
+                code: 'informational',
                 details: {
                     text: 'All OK',
                 },
@@ -10456,7 +10523,7 @@
         issue: [
             {
                 severity: 'information',
-                code: 'information',
+                code: 'informational',
                 details: {
                     text: 'Created',
                 },
@@ -10469,7 +10536,7 @@
         issue: [
             {
                 severity: 'information',
-                code: 'information',
+                code: 'informational',
                 details: {
                     text: 'Not Modified',
                 },
@@ -10521,7 +10588,7 @@
         issue: [
             {
                 severity: 'error',
-                code: 'gone',
+                code: 'deleted',
                 details: {
                     text: 'Gone',
                 },
@@ -10860,17 +10927,32 @@
      *   2) The "token" type includes enums and booleans.
      *   3) Arrays/multiple values are not reflected at all.
      *
-     * @param structureDefinitions Collection of StructureDefinition resources indexed by name.
      * @param resourceType The root resource type.
      * @param searchParam The search parameter.
      * @returns The search parameter type details.
      */
-    function getSearchParameterDetails(structureDefinitions, resourceType, searchParam) {
+    function getSearchParameterDetails(resourceType, searchParam) {
+        var _a, _b;
+        let result = (_b = (_a = globalSchema.types[resourceType]) === null || _a === void 0 ? void 0 : _a.searchParamsDetails) === null || _b === void 0 ? void 0 : _b[searchParam.code];
+        if (!result) {
+            result = buildSearchParamterDetails(resourceType, searchParam);
+        }
+        return result;
+    }
+    function setSearchParamterDetails(resourceType, code, details) {
+        const typeSchema = globalSchema.types[resourceType];
+        if (!typeSchema.searchParamsDetails) {
+            typeSchema.searchParamsDetails = {};
+        }
+        typeSchema.searchParamsDetails[code] = details;
+    }
+    function buildSearchParamterDetails(resourceType, searchParam) {
         var _a, _b, _c, _d, _e, _f, _g;
         if (searchParam.code === '_lastUpdated') {
             return { columnName: 'lastUpdated', type: exports.SearchParameterType.DATETIME };
         }
-        const columnName = convertCodeToColumnName(searchParam.code);
+        const code = searchParam.code;
+        const columnName = convertCodeToColumnName(code);
         const expression = (_a = getExpressionForResourceType(resourceType, searchParam.expression)) === null || _a === void 0 ? void 0 : _a.split('.');
         if (!expression) {
             // This happens on compound types
@@ -10885,7 +10967,7 @@
         for (let i = 1; i < expression.length; i++) {
             const propertyName = expression[i];
             elementDefinition =
-                (_d = (_c = (_b = structureDefinitions.types[baseType]) === null || _b === void 0 ? void 0 : _b.properties) === null || _c === void 0 ? void 0 : _c[propertyName]) !== null && _d !== void 0 ? _d : (_f = (_e = structureDefinitions.types[baseType]) === null || _e === void 0 ? void 0 : _e.properties) === null || _f === void 0 ? void 0 : _f[propertyName + '[x]'];
+                (_d = (_c = (_b = globalSchema.types[baseType]) === null || _b === void 0 ? void 0 : _b.properties) === null || _c === void 0 ? void 0 : _c[propertyName]) !== null && _d !== void 0 ? _d : (_f = (_e = globalSchema.types[baseType]) === null || _e === void 0 ? void 0 : _e.properties) === null || _f === void 0 ? void 0 : _f[propertyName + '[x]'];
             if (!elementDefinition) {
                 throw new Error(`Element definition not found for ${resourceType} ${searchParam.code}`);
             }
@@ -10908,7 +10990,9 @@
             }
         }
         const type = getSearchParameterType(searchParam, propertyType);
-        return { columnName, type, elementDefinition, array };
+        const result = { columnName, type, elementDefinition, array };
+        setSearchParamterDetails(resourceType, code, result);
+        return result;
     }
     /**
      * Converts a hyphen-delimited code to camelCase string.
@@ -10990,6 +11074,8 @@
     exports.EmptySetAtom = EmptySetAtom;
     exports.EqualsAtom = EqualsAtom;
     exports.EquivalentAtom = EquivalentAtom;
+    exports.FHIRPATH_KEYWORDS = FHIRPATH_KEYWORDS;
+    exports.FHIRPATH_OPERATORS = FHIRPATH_OPERATORS;
     exports.FIELD_SEPARATOR = FIELD_SEPARATOR;
     exports.FhirPathAtom = FhirPathAtom;
     exports.FunctionAtom = FunctionAtom;
@@ -11051,6 +11137,7 @@
     exports.getCodeBySystem = getCodeBySystem;
     exports.getDateProperty = getDateProperty;
     exports.getDisplayString = getDisplayString;
+    exports.getElementDefinition = getElementDefinition;
     exports.getExpressionForResourceType = getExpressionForResourceType;
     exports.getExtensionValue = getExtensionValue;
     exports.getIdentifier = getIdentifier;
@@ -11066,6 +11153,7 @@
     exports.indexSearchParameter = indexSearchParameter;
     exports.indexStructureDefinition = indexStructureDefinition;
     exports.indexStructureDefinitionBundle = indexStructureDefinitionBundle;
+    exports.initFhirPathParserBuilder = initFhirPathParserBuilder;
     exports.isEmpty = isEmpty;
     exports.isGone = isGone;
     exports.isLowerCase = isLowerCase;