@medplum/core 2.0.2 → 2.0.3

package/dist/cjs/index.cjs

@@ -1174,6 +1174,211 @@
         return decodePayload(payload);
     }
 
+    const OK_ID = 'ok';
+    const CREATED_ID = 'created';
+    const GONE_ID = 'gone';
+    const NOT_MODIFIED_ID = 'not-modified';
+    const NOT_FOUND_ID = 'not-found';
+    const UNAUTHORIZED_ID = 'unauthorized';
+    const FORBIDDEN_ID = 'forbidden';
+    const TOO_MANY_REQUESTS_ID = 'too-many-requests';
+    const allOk = {
+        resourceType: 'OperationOutcome',
+        id: OK_ID,
+        issue: [
+            {
+                severity: 'information',
+                code: 'informational',
+                details: {
+                    text: 'All OK',
+                },
+            },
+        ],
+    };
+    const created = {
+        resourceType: 'OperationOutcome',
+        id: CREATED_ID,
+        issue: [
+            {
+                severity: 'information',
+                code: 'informational',
+                details: {
+                    text: 'Created',
+                },
+            },
+        ],
+    };
+    const notModified = {
+        resourceType: 'OperationOutcome',
+        id: NOT_MODIFIED_ID,
+        issue: [
+            {
+                severity: 'information',
+                code: 'informational',
+                details: {
+                    text: 'Not Modified',
+                },
+            },
+        ],
+    };
+    const notFound = {
+        resourceType: 'OperationOutcome',
+        id: NOT_FOUND_ID,
+        issue: [
+            {
+                severity: 'error',
+                code: 'not-found',
+                details: {
+                    text: 'Not found',
+                },
+            },
+        ],
+    };
+    const unauthorized = {
+        resourceType: 'OperationOutcome',
+        id: UNAUTHORIZED_ID,
+        issue: [
+            {
+                severity: 'error',
+                code: 'login',
+                details: {
+                    text: 'Unauthorized',
+                },
+            },
+        ],
+    };
+    const forbidden = {
+        resourceType: 'OperationOutcome',
+        id: FORBIDDEN_ID,
+        issue: [
+            {
+                severity: 'error',
+                code: 'forbidden',
+                details: {
+                    text: 'Forbidden',
+                },
+            },
+        ],
+    };
+    const gone = {
+        resourceType: 'OperationOutcome',
+        id: GONE_ID,
+        issue: [
+            {
+                severity: 'error',
+                code: 'deleted',
+                details: {
+                    text: 'Gone',
+                },
+            },
+        ],
+    };
+    const tooManyRequests = {
+        resourceType: 'OperationOutcome',
+        id: TOO_MANY_REQUESTS_ID,
+        issue: [
+            {
+                severity: 'error',
+                code: 'throttled',
+                details: {
+                    text: 'Too Many Requests',
+                },
+            },
+        ],
+    };
+    function badRequest(details, expression) {
+        return {
+            resourceType: 'OperationOutcome',
+            issue: [
+                {
+                    severity: 'error',
+                    code: 'invalid',
+                    details: {
+                        text: details,
+                    },
+                    expression: expression ? [expression] : undefined,
+                },
+            ],
+        };
+    }
+    function isOperationOutcome(value) {
+        return typeof value === 'object' && value !== null && value.resourceType === 'OperationOutcome';
+    }
+    function isOk(outcome) {
+        return outcome.id === OK_ID || outcome.id === CREATED_ID || outcome.id === NOT_MODIFIED_ID;
+    }
+    function isNotFound(outcome) {
+        return outcome.id === NOT_FOUND_ID;
+    }
+    function isGone(outcome) {
+        return outcome.id === GONE_ID;
+    }
+    function getStatus(outcome) {
+        if (outcome.id === OK_ID) {
+            return 200;
+        }
+        else if (outcome.id === CREATED_ID) {
+            return 201;
+        }
+        else if (outcome.id === NOT_MODIFIED_ID) {
+            return 304;
+        }
+        else if (outcome.id === UNAUTHORIZED_ID) {
+            return 401;
+        }
+        else if (outcome.id === FORBIDDEN_ID) {
+            return 403;
+        }
+        else if (outcome.id === NOT_FOUND_ID) {
+            return 404;
+        }
+        else if (outcome.id === GONE_ID) {
+            return 410;
+        }
+        else if (outcome.id === TOO_MANY_REQUESTS_ID) {
+            return 429;
+        }
+        else {
+            return 400;
+        }
+    }
+    /**
+     * Asserts that the operation completed successfully and that the resource is defined.
+     * @param outcome The operation outcome.
+     * @param resource The resource that may or may not have been returned.
+     */
+    function assertOk(outcome, resource) {
+        if (!isOk(outcome) || resource === undefined) {
+            throw new OperationOutcomeError(outcome);
+        }
+    }
+    class OperationOutcomeError extends Error {
+        constructor(outcome) {
+            super(outcome?.issue?.[0].details?.text);
+            this.outcome = outcome;
+        }
+    }
+    /**
+     * Normalizes an error object into a displayable error string.
+     * @param error The error value which could be a string, Error, OperationOutcome, or other unknown type.
+     * @returns A display string for the error.
+     */
+    function normalizeErrorString(error) {
+        if (!error) {
+            return 'Unknown error';
+        }
+        if (typeof error === 'string') {
+            return error;
+        }
+        if (error instanceof Error) {
+            return error.message;
+        }
+        if (isOperationOutcome(error)) {
+            return error.issue?.[0]?.details?.text ?? 'Unknown error';
+        }
+        return JSON.stringify(error);
+    }
+
     var _ReadablePromise_suspender, _ReadablePromise_status, _ReadablePromise_response, _ReadablePromise_error, _a;
     /**
      * The ReadablePromise class wraps a request promise suitable for React Suspense.
@@ -5736,6 +5941,13 @@
     						code: "string"
     					}
     				]
+    			},
+    			useSubject: {
+    				type: [
+    					{
+    						code: "boolean"
+    					}
+    				]
     			}
     		}
     	}
@@ -6046,14 +6258,15 @@
 
     // PKCE auth based on:
     // https://aws.amazon.com/blogs/security/how-to-add-authentication-single-page-web-application-with-amazon-cognito-oauth2-implementation/
-    var _MedplumClient_instances, _MedplumClient_fetch, _MedplumClient_createPdf, _MedplumClient_storage, _MedplumClient_requestCache, _MedplumClient_cacheTime, _MedplumClient_baseUrl, _MedplumClient_fhirBaseUrl, _MedplumClient_authorizeUrl, _MedplumClient_tokenUrl, _MedplumClient_logoutUrl, _MedplumClient_onUnauthenticated, _MedplumClient_autoBatchTime, _MedplumClient_autoBatchQueue, _MedplumClient_clientId, _MedplumClient_clientSecret, _MedplumClient_autoBatchTimerId, _MedplumClient_accessToken, _MedplumClient_refreshToken, _MedplumClient_refreshPromise, _MedplumClient_profilePromise, _MedplumClient_profile, _MedplumClient_config, _MedplumClient_addLogin, _MedplumClient_refreshProfile, _MedplumClient_getCacheEntry, _MedplumClient_setCacheEntry, _MedplumClient_request, _MedplumClient_executeAutoBatch, _MedplumClient_addFetchOptionsDefaults, _MedplumClient_setRequestContentType, _MedplumClient_setRequestBody, _MedplumClient_handleUnauthenticated, _MedplumClient_requestAuthorization, _MedplumClient_refresh, _MedplumClient_fetchTokens, _MedplumClient_verifyTokens, _MedplumClient_setupStorageListener;
-    const MEDPLUM_VERSION = "2.0.2-2d479f42";
+    var _MedplumClient_instances, _MedplumClient_fetch, _MedplumClient_createPdf, _MedplumClient_storage, _MedplumClient_requestCache, _MedplumClient_cacheTime, _MedplumClient_baseUrl, _MedplumClient_fhirBaseUrl, _MedplumClient_authorizeUrl, _MedplumClient_tokenUrl, _MedplumClient_logoutUrl, _MedplumClient_onUnauthenticated, _MedplumClient_autoBatchTime, _MedplumClient_autoBatchQueue, _MedplumClient_clientId, _MedplumClient_clientSecret, _MedplumClient_autoBatchTimerId, _MedplumClient_accessToken, _MedplumClient_refreshToken, _MedplumClient_refreshPromise, _MedplumClient_profilePromise, _MedplumClient_profile, _MedplumClient_config, _MedplumClient_addLogin, _MedplumClient_refreshProfile, _MedplumClient_getCacheEntry, _MedplumClient_setCacheEntry, _MedplumClient_cacheResource, _MedplumClient_deleteCacheEntry, _MedplumClient_request, _MedplumClient_fetchWithRetry, _MedplumClient_executeAutoBatch, _MedplumClient_addFetchOptionsDefaults, _MedplumClient_setRequestContentType, _MedplumClient_setRequestBody, _MedplumClient_handleUnauthenticated, _MedplumClient_requestAuthorization, _MedplumClient_refresh, _MedplumClient_fetchTokens, _MedplumClient_verifyTokens, _MedplumClient_setupStorageListener;
+    const MEDPLUM_VERSION = "2.0.3-e39c01ab";
     const DEFAULT_BASE_URL = 'https://api.medplum.com/';
     const DEFAULT_RESOURCE_CACHE_SIZE = 1000;
     const DEFAULT_CACHE_TIME = 60000; // 60 seconds
     const JSON_CONTENT_TYPE = 'application/json';
     const FHIR_CONTENT_TYPE = 'application/fhir+json';
     const PATCH_CONTENT_TYPE = 'application/json-patch+json';
+    const system = { resourceType: 'Device', id: 'system', deviceName: [{ name: 'System' }] };
     /**
      * The MedplumClient class provides a client for the Medplum FHIR server.
      *
@@ -6465,16 +6678,29 @@
          * @param clientId The external client ID.
          * @param redirectUri The external identity provider redirect URI.
          * @param baseLogin The Medplum login request.
+         * @category Authentication
          */
         async signInWithExternalAuth(authorizeUrl, clientId, redirectUri, baseLogin) {
             const loginRequest = await this.ensureCodeChallenge(baseLogin);
+            window.location.assign(this.getExternalAuthRedirectUri(authorizeUrl, clientId, redirectUri, loginRequest));
+        }
+        /**
+         * Builds the external identity provider redirect URI.
+         * @param authorizeUrl The external authorization URL.
+         * @param clientId The external client ID.
+         * @param redirectUri The external identity provider redirect URI.
+         * @param loginRequest  The Medplum login request.
+         * @returns The external identity provider redirect URI.
+         * @category Authentication
+         */
+        getExternalAuthRedirectUri(authorizeUrl, clientId, redirectUri, loginRequest) {
             const url = new URL(authorizeUrl);
             url.searchParams.set('response_type', 'code');
             url.searchParams.set('client_id', clientId);
             url.searchParams.set('redirect_uri', redirectUri);
             url.searchParams.set('scope', 'openid profile email');
             url.searchParams.set('state', JSON.stringify(loginRequest));
-            window.location.assign(url.toString());
+            return url.toString();
         }
         /**
          * Builds a FHIR URL from a collection of URL path components.
@@ -6549,7 +6775,23 @@
          * @returns Promise to the search result bundle.
          */
         search(resourceType, query, options = {}) {
-            return this.get(this.fhirSearchUrl(resourceType, query), options);
+            const url = this.fhirSearchUrl(resourceType, query);
+            const cacheKey = url.toString() + '-search';
+            const cached = __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_getCacheEntry).call(this, cacheKey, options);
+            if (cached) {
+                return cached.value;
+            }
+            const promise = new ReadablePromise((async () => {
+                const bundle = await this.get(url, options);
+                if (bundle.entry) {
+                    for (const entry of bundle.entry) {
+                        __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_cacheResource).call(this, entry.resource);
+                    }
+                }
+                return bundle;
+            })());
+            __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_setCacheEntry).call(this, cacheKey, promise);
+            return promise;
         }
         /**
          * Sends a FHIR search request for a single resource.
@@ -6658,6 +6900,9 @@
             if (!refString) {
                 return undefined;
             }
+            if (refString === 'system') {
+                return system;
+            }
             const [resourceType, id] = refString.split('/');
             if (!resourceType || !id) {
                 return undefined;
@@ -6710,6 +6955,9 @@
             if (!refString) {
                 return new ReadablePromise(Promise.reject(new Error('Missing reference')));
             }
+            if (refString === 'system') {
+                return new ReadablePromise(Promise.resolve(system));
+            }
             const [resourceType, id] = refString.split('/');
             if (!resourceType || !id) {
                 return new ReadablePromise(Promise.reject(new Error('Invalid reference')));
@@ -6734,11 +6982,17 @@
          * @param resourceType The FHIR resource type.
          * @returns Promise to a schema with the requested resource type.
          */
-        async requestSchema(resourceType) {
+        requestSchema(resourceType) {
             if (resourceType in globalSchema.types) {
-                return globalSchema;
+                return Promise.resolve(globalSchema);
             }
-            const query = `{
+            const cacheKey = resourceType + '-requestSchema';
+            const cached = __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_getCacheEntry).call(this, cacheKey, undefined);
+            if (cached) {
+                return cached.value;
+            }
+            const promise = new ReadablePromise((async () => {
+                const query = `{
       StructureDefinitionList(name: "${resourceType}") {
         name,
         description,
@@ -6767,14 +7021,17 @@
         target
       }
     }`.replace(/\s+/g, ' ');
-            const response = (await this.graphql(query));
-            for (const structureDefinition of response.data.StructureDefinitionList) {
-                indexStructureDefinition(structureDefinition);
-            }
-            for (const searchParameter of response.data.SearchParameterList) {
-                indexSearchParameter(searchParameter);
-            }
-            return globalSchema;
+                const response = (await this.graphql(query));
+                for (const structureDefinition of response.data.StructureDefinitionList) {
+                    indexStructureDefinition(structureDefinition);
+                }
+                for (const searchParameter of response.data.SearchParameterList) {
+                    indexSearchParameter(searchParameter);
+                }
+                return globalSchema;
+            })());
+            __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_setCacheEntry).call(this, cacheKey, promise);
+            return promise;
         }
         /**
          * Reads resource history by resource type and ID.
@@ -7075,10 +7332,15 @@
                 throw new Error('Missing id');
             }
             this.invalidateSearches(resource.resourceType);
-            const result = await this.put(this.fhirUrl(resource.resourceType, resource.id), resource);
-            // On 304 not modified, result will be undefined
-            // Return the user input instead
-            return result ?? resource;
+            let result = await this.put(this.fhirUrl(resource.resourceType, resource.id), resource);
+            if (!result) {
+                // On 304 not modified, result will be undefined
+                // Return the user input instead
+                // return result ?? resource;
+                result = resource;
+            }
+            __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_cacheResource).call(this, result);
+            return result;
         }
         /**
          * Updates a FHIR resource using JSONPatch operations.
@@ -7125,6 +7387,7 @@
          * @returns The result of the delete operation.
          */
         deleteResource(resourceType, id) {
+            __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_deleteCacheEntry).call(this, this.fhirUrl(resourceType, id).toString());
             this.invalidateSearches(resourceType);
             return this.delete(this.fhirUrl(resourceType, id));
         }
@@ -7464,6 +7727,14 @@
         if (__classPrivateFieldGet(this, _MedplumClient_cacheTime, "f") > 0) {
             __classPrivateFieldGet(this, _MedplumClient_requestCache, "f").set(key, { requestTime: Date.now(), value });
         }
+    }, _MedplumClient_cacheResource = function _MedplumClient_cacheResource(resource) {
+        if (resource?.id) {
+            __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_setCacheEntry).call(this, this.fhirUrl(resource.resourceType, resource.id).toString(), new ReadablePromise(Promise.resolve(resource)));
+        }
+    }, _MedplumClient_deleteCacheEntry = function _MedplumClient_deleteCacheEntry(key) {
+        if (__classPrivateFieldGet(this, _MedplumClient_cacheTime, "f") > 0) {
+            __classPrivateFieldGet(this, _MedplumClient_requestCache, "f").delete(key);
+        }
     }, _MedplumClient_request = 
     /**
      * Makes an HTTP request.
@@ -7481,7 +7752,7 @@
         }
         options.method = method;
         __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_addFetchOptionsDefaults).call(this, options);
-        const response = await __classPrivateFieldGet(this, _MedplumClient_fetch, "f").call(this, url, options);
+        const response = await __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_fetchWithRetry).call(this, url, options);
         if (response.status === 401) {
             // Refresh and try again
             return __classPrivateFieldGet(this, _MedplumClient_instances, "m", _MedplumClient_handleUnauthenticated).call(this, method, url, options);
@@ -7490,11 +7761,30 @@
             // No content or change
             return undefined;
         }
-        const obj = await response.json();
+        let obj = undefined;
+        try {
+            obj = await response.json();
+        }
+        catch (err) {
+            console.error('Error parsing response', response.status, err);
+            throw err;
+        }
         if (response.status >= 400) {
             throw obj;
         }
         return obj;
+    }, _MedplumClient_fetchWithRetry = async function _MedplumClient_fetchWithRetry(url, options) {
+        const maxRetries = 3;
+        const retryDelay = 200;
+        let response = undefined;
+        for (let retry = 0; retry < maxRetries; retry++) {
+            response = (await __classPrivateFieldGet(this, _MedplumClient_fetch, "f").call(this, url, options));
+            if (response.status < 500) {
+                return response;
+            }
+            await new Promise((resolve) => setTimeout(resolve, retryDelay));
+        }
+        return response;
     }, _MedplumClient_executeAutoBatch = 
     /**
      * Executes a batch of requests that were automatically batched together.
@@ -7530,7 +7820,12 @@
         for (let i = 0; i < entries.length; i++) {
             const entry = entries[i];
             const responseEntry = response.entry?.[i];
-            entry.resolve(responseEntry?.resource);
+            if (responseEntry?.response?.outcome && !isOk(responseEntry.response.outcome)) {
+                entry.reject(responseEntry.response.outcome);
+            }
+            else {
+                entry.resolve(responseEntry?.resource);
+            }
         }
     }, _MedplumClient_addFetchOptionsDefaults = function _MedplumClient_addFetchOptionsDefaults(options) {
         if (!options.headers) {
@@ -11129,209 +11424,6 @@
         return operator === exports.Operator.NOT_EQUALS || operator === exports.Operator.NOT;
     }
 
-    const OK_ID = 'ok';
-    const CREATED_ID = 'created';
-    const GONE_ID = 'gone';
-    const NOT_MODIFIED_ID = 'not-modified';
-    const NOT_FOUND_ID = 'not-found';
-    const UNAUTHORIZED_ID = 'unauthorized';
-    const FORBIDDEN_ID = 'forbidden';
-    const TOO_MANY_REQUESTS_ID = 'too-many-requests';
-    const allOk = {
-        resourceType: 'OperationOutcome',
-        id: OK_ID,
-        issue: [
-            {
-                severity: 'information',
-                code: 'informational',
-                details: {
-                    text: 'All OK',
-                },
-            },
-        ],
-    };
-    const created = {
-        resourceType: 'OperationOutcome',
-        id: CREATED_ID,
-        issue: [
-            {
-                severity: 'information',
-                code: 'informational',
-                details: {
-                    text: 'Created',
-                },
-            },
-        ],
-    };
-    const notModified = {
-        resourceType: 'OperationOutcome',
-        id: NOT_MODIFIED_ID,
-        issue: [
-            {
-                severity: 'information',
-                code: 'informational',
-                details: {
-                    text: 'Not Modified',
-                },
-            },
-        ],
-    };
-    const notFound = {
-        resourceType: 'OperationOutcome',
-        id: NOT_FOUND_ID,
-        issue: [
-            {
-                severity: 'error',
-                code: 'not-found',
-                details: {
-                    text: 'Not found',
-                },
-            },
-        ],
-    };
-    const unauthorized = {
-        resourceType: 'OperationOutcome',
-        id: UNAUTHORIZED_ID,
-        issue: [
-            {
-                severity: 'error',
-                code: 'login',
-                details: {
-                    text: 'Unauthorized',
-                },
-            },
-        ],
-    };
-    const forbidden = {
-        resourceType: 'OperationOutcome',
-        id: FORBIDDEN_ID,
-        issue: [
-            {
-                severity: 'error',
-                code: 'forbidden',
-                details: {
-                    text: 'Forbidden',
-                },
-            },
-        ],
-    };
-    const gone = {
-        resourceType: 'OperationOutcome',
-        id: GONE_ID,
-        issue: [
-            {
-                severity: 'error',
-                code: 'deleted',
-                details: {
-                    text: 'Gone',
-                },
-            },
-        ],
-    };
-    const tooManyRequests = {
-        resourceType: 'OperationOutcome',
-        id: TOO_MANY_REQUESTS_ID,
-        issue: [
-            {
-                severity: 'error',
-                code: 'throttled',
-                details: {
-                    text: 'Too Many Requests',
-                },
-            },
-        ],
-    };
-    function badRequest(details, expression) {
-        return {
-            resourceType: 'OperationOutcome',
-            issue: [
-                {
-                    severity: 'error',
-                    code: 'invalid',
-                    details: {
-                        text: details,
-                    },
-                    expression: expression ? [expression] : undefined,
-                },
-            ],
-        };
-    }
-    function isOk(outcome) {
-        return outcome.id === OK_ID || outcome.id === CREATED_ID || outcome.id === NOT_MODIFIED_ID;
-    }
-    function isNotFound(outcome) {
-        return outcome.id === NOT_FOUND_ID;
-    }
-    function isGone(outcome) {
-        return outcome.id === GONE_ID;
-    }
-    function getStatus(outcome) {
-        if (outcome.id === OK_ID) {
-            return 200;
-        }
-        else if (outcome.id === CREATED_ID) {
-            return 201;
-        }
-        else if (outcome.id === NOT_MODIFIED_ID) {
-            return 304;
-        }
-        else if (outcome.id === UNAUTHORIZED_ID) {
-            return 401;
-        }
-        else if (outcome.id === FORBIDDEN_ID) {
-            return 403;
-        }
-        else if (outcome.id === NOT_FOUND_ID) {
-            return 404;
-        }
-        else if (outcome.id === GONE_ID) {
-            return 410;
-        }
-        else if (outcome.id === TOO_MANY_REQUESTS_ID) {
-            return 429;
-        }
-        else {
-            return 400;
-        }
-    }
-    /**
-     * Asserts that the operation completed successfully and that the resource is defined.
-     * @param outcome The operation outcome.
-     * @param resource The resource that may or may not have been returned.
-     */
-    function assertOk(outcome, resource) {
-        if (!isOk(outcome) || resource === undefined) {
-            throw new OperationOutcomeError(outcome);
-        }
-    }
-    class OperationOutcomeError extends Error {
-        constructor(outcome) {
-            super(outcome?.issue?.[0].details?.text);
-            this.outcome = outcome;
-        }
-    }
-    /**
-     * Normalizes an error object into a displayable error string.
-     * @param error The error value which could be a string, Error, OperationOutcome, or other unknown type.
-     * @returns A display string for the error.
-     */
-    function normalizeErrorString(error) {
-        if (!error) {
-            return 'Unknown error';
-        }
-        if (typeof error === 'string') {
-            return error;
-        }
-        if (error instanceof Error) {
-            return error.message;
-        }
-        if (typeof error === 'object' && 'resourceType' in error) {
-            const outcome = error;
-            return outcome.issue?.[0]?.details?.text ?? 'Unknown error';
-        }
-        return JSON.stringify(error);
-    }
-
     exports.AndAtom = AndAtom;
     exports.ArithemticOperatorAtom = ArithemticOperatorAtom;
     exports.AsAtom = AsAtom;
@@ -11437,6 +11529,7 @@
     exports.isNotFound = isNotFound;
     exports.isObject = isObject$1;
     exports.isOk = isOk;
+    exports.isOperationOutcome = isOperationOutcome;
     exports.isPeriod = isPeriod;
     exports.isProfileResource = isProfileResource;
     exports.isQuantity = isQuantity;