@medplum/core 2.0.15 → 2.0.17

package/dist/cjs/index.cjs

@@ -322,8 +322,9 @@
         return capitalize(builder.join(' ').trim());
     }
     /**
-     * Returns a human-readable string for a FHIR Range datatype, taking into account comparators and one-sided ranges
+     * Returns a human-readable string for a FHIR Range datatype, taking into account one-sided ranges
      * @param range A FHIR Range element
+     * @param precision Number of decimal places to display in the rendered quantity values
      * @param exclusive If true, one-sided ranges will be rendered with the '>' or '<' bounds rather than '>=' or '<='
      * @returns A human-readable string representation of the Range
      */
@@ -331,33 +332,41 @@
         if (exclusive && precision === undefined) {
             throw new Error('Precision must be specified for exclusive ranges');
         }
-        const low = range?.low && { ...range.low };
-        const high = range?.high && { ...range.high };
-        if (!range || (low?.value === undefined && high?.value === undefined)) {
+        // Extract high and low range endpoints, explicitly ignoring any comparator
+        // since Range uses SimpleQuantity variants (see http://www.hl7.org/fhir/datatypes.html#Range)
+        const low = range?.low && { ...range.low, comparator: undefined };
+        const high = range?.high && { ...range.high, comparator: undefined };
+        if (low?.value === undefined && high?.value === undefined) {
             return '';
         }
-        if (range.low?.value !== undefined && range.high?.value === undefined) {
+        if (low?.value !== undefined && high?.value === undefined) {
+            // Lower bound only
             if (exclusive && precision !== undefined) {
-                range.low.value = preciseDecrement(range.low.value, precision);
-                return `> ${formatQuantity(range.low, precision)}`;
+                low.value = preciseDecrement(low.value, precision);
+                return `> ${formatQuantity(low, precision)}`;
             }
-            return `>= ${formatQuantity(range.low, precision)}`;
+            return `>= ${formatQuantity(low, precision)}`;
         }
-        if (range.low?.value === undefined && range.high?.value !== undefined) {
+        else if (low?.value === undefined && high?.value !== undefined) {
+            // Upper bound only
             if (exclusive && precision !== undefined) {
-                range.high.value = preciseIncrement(range.high.value, precision);
-                return `< ${formatQuantity(range.high, precision)}`;
+                high.value = preciseIncrement(high.value, precision);
+                return `< ${formatQuantity(high, precision)}`;
             }
-            return `<= ${formatQuantity(range.high, precision)}`;
+            return `<= ${formatQuantity(high, precision)}`;
         }
-        if (low?.unit === high?.unit) {
-            delete low?.unit;
+        else {
+            // Double-sided range
+            if (low?.unit === high?.unit) {
+                delete low?.unit; // Format like "X - Y units" instead of "X units - Y units"
+            }
+            return `${formatQuantity(low, precision)} - ${formatQuantity(high, precision)}`;
         }
-        return `${formatQuantity(low, precision)} - ${formatQuantity(high, precision)}`;
     }
     /**
      * Returns a human-readable string for a FHIR Quantity datatype, taking into account units and comparators
      * @param quantity A FHIR Quantity element
+     * @param precision Number of decimal places to display in the rendered quantity values
      * @returns A human-readable string representation of the Quantity
      */
     function formatQuantity(quantity, precision) {
@@ -1203,6 +1212,7 @@
     const UNAUTHORIZED_ID = 'unauthorized';
     const FORBIDDEN_ID = 'forbidden';
     const TOO_MANY_REQUESTS_ID = 'too-many-requests';
+    const ACCEPTED_ID = 'accepted';
     const allOk = {
         resourceType: 'OperationOutcome',
         id: OK_ID,
@@ -1307,6 +1317,19 @@
             },
         ],
     };
+    const accepted = {
+        resourceType: 'OperationOutcome',
+        id: ACCEPTED_ID,
+        issue: [
+            {
+                severity: 'information',
+                code: 'informational',
+                details: {
+                    text: 'Accepted',
+                },
+            },
+        ],
+    };
     function badRequest(details, expression) {
         return {
             resourceType: 'OperationOutcome',
@@ -6381,7 +6404,7 @@
     const globalSchema = baseSchema;
 
     // PKCE auth based on:
-    const MEDPLUM_VERSION = "2.0.15-025c3c04";
+    const MEDPLUM_VERSION = "2.0.17-5c5ebbda";
     const DEFAULT_BASE_URL = 'https://api.medplum.com/';
     const DEFAULT_RESOURCE_CACHE_SIZE = 1000;
     const DEFAULT_CACHE_TIME = 60000; // 60 seconds
@@ -6389,6 +6412,35 @@
     const FHIR_CONTENT_TYPE = 'application/fhir+json';
     const PATCH_CONTENT_TYPE = 'application/json-patch+json';
     const system = { resourceType: 'Device', id: 'system', deviceName: [{ name: 'System' }] };
+    /**
+     * OAuth 2.0 Grant Type Identifiers
+     * Standard identifiers defined here: https://datatracker.ietf.org/doc/html/draft-ietf-oauth-v2-1-07#name-grant-types
+     * Token exchange extension defined here: https://datatracker.ietf.org/doc/html/rfc8693
+     */
+    exports.OAuthGrantType = void 0;
+    (function (OAuthGrantType) {
+        OAuthGrantType["ClientCredentials"] = "client_credentials";
+        OAuthGrantType["AuthorizationCode"] = "authorization_code";
+        OAuthGrantType["RefreshToken"] = "refresh_token";
+        OAuthGrantType["TokenExchange"] = "urn:ietf:params:oauth:grant-type:token-exchange";
+    })(exports.OAuthGrantType || (exports.OAuthGrantType = {}));
+    /**
+     * OAuth 2.0 Token Type Identifiers
+     * See: https://datatracker.ietf.org/doc/html/rfc8693#name-token-type-identifiers
+     */
+    exports.OAuthTokenType = void 0;
+    (function (OAuthTokenType) {
+        /** Indicates that the token is an OAuth 2.0 access token issued by the given authorization server. */
+        OAuthTokenType["AccessToken"] = "urn:ietf:params:oauth:token-type:access_token";
+        /** Indicates that the token is an OAuth 2.0 refresh token issued by the given authorization server. */
+        OAuthTokenType["RefreshToken"] = "urn:ietf:params:oauth:token-type:refresh_token";
+        /** Indicates that the token is an ID Token as defined in Section 2 of [OpenID.Core]. */
+        OAuthTokenType["IdToken"] = "urn:ietf:params:oauth:token-type:id_token";
+        /** Indicates that the token is a base64url-encoded SAML 1.1 [OASIS.saml-core-1.1] assertion. */
+        OAuthTokenType["Saml1Token"] = "urn:ietf:params:oauth:token-type:saml1";
+        /** Indicates that the token is a base64url-encoded SAML 2.0 [OASIS.saml-core-2.0-os] assertion. */
+        OAuthTokenType["Saml2Token"] = "urn:ietf:params:oauth:token-type:saml2";
+    })(exports.OAuthTokenType || (exports.OAuthTokenType = {}));
     /**
      * The MedplumClient class provides a client for the Medplum FHIR server.
      *
@@ -6458,7 +6510,6 @@
             this.authorizeUrl = options?.authorizeUrl || this.baseUrl + 'oauth2/authorize';
             this.tokenUrl = options?.tokenUrl || this.baseUrl + 'oauth2/token';
             this.logoutUrl = options?.logoutUrl || this.baseUrl + 'oauth2/logout';
-            this.exchangeUrl = this.baseUrl + 'auth/exchange';
             this.onUnauthenticated = options?.onUnauthenticated;
             this.cacheTime = options?.cacheTime ?? DEFAULT_CACHE_TIME;
             if (this.cacheTime > 0) {
@@ -6530,7 +6581,7 @@
          * @param resourceType The resource type to invalidate.
          */
         invalidateSearches(resourceType) {
-            const url = 'fhir/R4/' + resourceType;
+            const url = this.fhirBaseUrl + resourceType;
             if (this.requestCache) {
                 for (const key of this.requestCache.keys()) {
                     if (key.endsWith(url) || key.includes(url + '?')) {
@@ -6808,22 +6859,12 @@
             if (!clientId) {
                 throw new Error('MedplumClient is missing clientId');
             }
-            const response = await this.fetch(this.exchangeUrl, {
-                method: 'POST',
-                headers: { 'Content-Type': 'application/json' },
-                body: JSON.stringify({
-                    clientId: this.clientId,
-                    externalAccessToken: token,
-                }),
-                credentials: 'include',
-            });
-            if (!response.ok) {
-                this.clearActiveLogin();
-                throw new Error('Failed to fetch tokens');
-            }
-            const tokens = await response.json();
-            await this.verifyTokens(tokens);
-            return this.getProfile();
+            const formBody = new URLSearchParams();
+            formBody.set('grant_type', exports.OAuthGrantType.TokenExchange);
+            formBody.set('subject_token_type', exports.OAuthTokenType.AccessToken);
+            formBody.set('client_id', clientId);
+            formBody.set('subject_token', token);
+            return this.fetchTokens(formBody);
         }
         /**
          * Builds the external identity provider redirect URI.
@@ -7655,7 +7696,7 @@
          * @returns The FHIR batch/transaction response bundle.
          */
         executeBatch(bundle) {
-            return this.post('fhir/R4', bundle);
+            return this.post(this.fhirBaseUrl.slice(0, -1), bundle);
         }
         /**
          * Sends an email using the Medplum Email API.
@@ -7999,7 +8040,7 @@
                 })),
             };
             // Execute the batch request
-            const response = (await this.post('fhir/R4', batch));
+            const response = (await this.post(this.fhirBaseUrl.slice(0, -1), batch));
             // Process the response
             for (let i = 0; i < entries.length; i++) {
                 const entry = entries[i];
@@ -8127,7 +8168,7 @@
          */
         processCode(code, loginParams) {
             const formBody = new URLSearchParams();
-            formBody.set('grant_type', 'authorization_code');
+            formBody.set('grant_type', exports.OAuthGrantType.AuthorizationCode);
             formBody.set('code', code);
             formBody.set('client_id', loginParams?.clientId || this.clientId);
             formBody.set('redirect_uri', loginParams?.redirectUri || getWindowOrigin());
@@ -8149,7 +8190,7 @@
             }
             if (this.refreshToken) {
                 const formBody = new URLSearchParams();
-                formBody.set('grant_type', 'refresh_token');
+                formBody.set('grant_type', exports.OAuthGrantType.RefreshToken);
                 formBody.set('client_id', this.clientId);
                 formBody.set('refresh_token', this.refreshToken);
                 this.refreshPromise = this.fetchTokens(formBody);
@@ -8173,7 +8214,7 @@
             this.clientId = clientId;
             this.clientSecret = clientSecret;
             const formBody = new URLSearchParams();
-            formBody.set('grant_type', 'client_credentials');
+            formBody.set('grant_type', exports.OAuthGrantType.ClientCredentials);
             formBody.set('client_id', clientId);
             formBody.set('client_secret', clientSecret);
             return this.fetchTokens(formBody);
@@ -12278,7 +12319,18 @@
      * @returns A parsed SearchRequest.
      */
     function parseSearchRequest(resourceType, query) {
-        return parseSearchImpl(resourceType, query);
+        const queryArray = [];
+        for (const [key, value] of Object.entries(query)) {
+            if (Array.isArray(value)) {
+                for (let i = 0; i < value.length; i++) {
+                    queryArray.push([key, value[i]]);
+                }
+            }
+            else {
+                queryArray.push([key, value || '']);
+            }
+        }
+        return parseSearchImpl(resourceType, queryArray);
     }
     /**
      * Parses a search URL into a search request.
@@ -12287,7 +12339,7 @@
      */
     function parseSearchUrl(url) {
         const resourceType = url.pathname.split('/').filter(Boolean).pop();
-        return parseSearchImpl(resourceType, Object.fromEntries(url.searchParams.entries()));
+        return parseSearchImpl(resourceType, url.searchParams.entries());
     }
     /**
      * Parses a URL string into a SearchRequest.
@@ -12301,13 +12353,8 @@
         const searchRequest = {
             resourceType,
         };
-        for (const [key, value] of Object.entries(query)) {
-            if (Array.isArray(value)) {
-                value.forEach((element) => parseKeyValue(searchRequest, key, element));
-            }
-            else {
-                parseKeyValue(searchRequest, key, value ?? '');
-            }
+        for (const [key, value] of query) {
+            parseKeyValue(searchRequest, key, value);
         }
         return searchRequest;
     }
@@ -12708,6 +12755,7 @@
     exports.UnaryOperatorAtom = UnaryOperatorAtom;
     exports.UnionAtom = UnionAtom;
     exports.XorAtom = XorAtom;
+    exports.accepted = accepted;
     exports.allOk = allOk;
     exports.arrayBufferToBase64 = arrayBufferToBase64;
     exports.arrayBufferToHex = arrayBufferToHex;