@medplum/fhir-router 2.0.4 → 2.0.6

package/dist/esm/index.mjs

@@ -1,4 +1,4 @@
-import { badRequest, parseSearchUrl, allOk, getStatus, isOk, getReferenceString, LRUCache, forbidden, getResourceTypes, getResourceTypeSchema, isResourceType, getElementDefinition, buildTypeName, capitalize, getSearchParameters, normalizeErrorString, Operator, parseSearchRequest, notFound, created, deepClone, matchesSearchRequest, globalSchema, evalFhirPath } from '@medplum/core';
+import { OperationOutcomeError, badRequest, normalizeOperationOutcome, parseSearchUrl, getStatus, isOk, getReferenceString, allOk, LRUCache, forbidden, getResourceTypes, getResourceTypeSchema, isResourceTypeSchema, getElementDefinition, buildTypeName, capitalize, getSearchParameters, Operator, parseSearchRequest, notFound, created, deepClone, matchesSearchRequest, globalSchema, evalFhirPath } from '@medplum/core';
 import DataLoader from 'dataloader';
 import { applyPatch } from 'rfc6902';
 
@@ -72,14 +72,14 @@ class BatchProcessor {
     async processBatch() {
         const bundleType = this.bundle.type;
         if (!bundleType) {
-            throw badRequest('Missing bundle type');
+            throw new OperationOutcomeError(badRequest('Missing bundle type'));
         }
         if (bundleType !== 'batch' && bundleType !== 'transaction') {
-            throw badRequest('Unrecognized bundle type');
+            throw new OperationOutcomeError(badRequest('Unrecognized bundle type'));
         }
         const entries = this.bundle.entry;
         if (!entries) {
-            throw badRequest('Missing bundle entry');
+            throw new OperationOutcomeError(badRequest('Missing bundle entry'));
         }
         const resultEntries = [];
         for (const entry of entries) {
@@ -88,12 +88,12 @@ class BatchProcessor {
                 resultEntries.push(await __classPrivateFieldGet(this, _BatchProcessor_instances, "m", _BatchProcessor_processBatchEntry).call(this, rewritten));
             }
             catch (err) {
-                resultEntries.push(buildBundleResponse(err));
+                resultEntries.push(buildBundleResponse(normalizeOperationOutcome(err)));
             }
         }
         return {
             resourceType: 'Bundle',
-            type: 'batch-response',
+            type: (bundleType + '-response'),
             entry: resultEntries,
         };
     }
@@ -116,7 +116,11 @@ async function _BatchProcessor_processBatchEntry(entry) {
             return buildBundleResponse(badRequest('Multiple matches'));
         }
         if (entries.length === 1) {
-            return buildBundleResponse(allOk, entries[0].resource);
+            const matchingResource = entries[0].resource;
+            if (entry.fullUrl) {
+                __classPrivateFieldGet(this, _BatchProcessor_instances, "m", _BatchProcessor_addReplacementId).call(this, entry.fullUrl, matchingResource);
+            }
+            return buildBundleResponse(allOk, matchingResource);
         }
     }
     let body = entry.resource;
@@ -139,24 +143,24 @@ async function _BatchProcessor_processBatchEntry(entry) {
     return buildBundleResponse(result[0], result[1]);
 }, _BatchProcessor_validateEntry = function _BatchProcessor_validateEntry(entry) {
     if (!entry.request) {
-        throw badRequest('Missing entry.request');
+        throw new OperationOutcomeError(badRequest('Missing entry.request'));
     }
     if (!entry.request.method) {
-        throw badRequest('Missing entry.request.method');
+        throw new OperationOutcomeError(badRequest('Missing entry.request.method'));
     }
     if (!entry.request.url) {
-        throw badRequest('Missing entry.request.url');
+        throw new OperationOutcomeError(badRequest('Missing entry.request.url'));
     }
 }, _BatchProcessor_parsePatchBody = function _BatchProcessor_parsePatchBody(entry) {
     const patchResource = entry.resource;
     if (!patchResource) {
-        throw badRequest('Missing entry.resource');
+        throw new OperationOutcomeError(badRequest('Missing entry.resource'));
     }
     if (patchResource.resourceType !== 'Binary') {
-        throw badRequest('Patch resource must be a Binary');
+        throw new OperationOutcomeError(badRequest('Patch resource must be a Binary'));
     }
     if (!patchResource.data) {
-        throw badRequest('Missing entry.resource.data');
+        throw new OperationOutcomeError(badRequest('Missing entry.resource.data'));
     }
     return JSON.parse(Buffer.from(patchResource.data, 'base64').toString('utf8'));
 }, _BatchProcessor_addReplacementId = function _BatchProcessor_addReplacementId(fullUrl, resource) {
@@ -13527,7 +13531,7 @@ function buildGraphQLFields(resourceType) {
 function buildPropertyFields(resourceType, fields) {
     const schema = getResourceTypeSchema(resourceType);
     const properties = schema.properties;
-    if (isResourceType(schema)) {
+    if (isResourceTypeSchema(schema)) {
         fields.resourceType = {
             type: new GraphQLNonNull(GraphQLString),
             description: 'Resource Type',
@@ -13693,7 +13697,7 @@ async function resolveById(_source, args, ctx, info) {
         return await ctx.dataLoader.load({ reference: `${info.fieldName}/${args.id}` });
     }
     catch (err) {
-        throw new Error(normalizeErrorString(err));
+        throw new OperationOutcomeError(normalizeOperationOutcome(err), err);
     }
 }
 /**
@@ -13710,7 +13714,7 @@ async function resolveByReference(source, _args, ctx) {
         return await ctx.dataLoader.load(source);
     }
     catch (err) {
-        throw new Error(normalizeErrorString(err));
+        throw new OperationOutcomeError(normalizeOperationOutcome(err), err);
     }
 }
 /**
@@ -14018,25 +14022,25 @@ class MemoryRepository {
         try {
             const patchResult = applyPatch(resource, patch).filter(Boolean);
             if (patchResult.length > 0) {
-                throw badRequest(patchResult.map((e) => e.message).join('\n'));
+                throw new OperationOutcomeError(badRequest(patchResult.map((e) => e.message).join('\n')));
             }
         }
         catch (err) {
-            throw badRequest(normalizeErrorString(err));
+            throw new OperationOutcomeError(normalizeOperationOutcome(err));
         }
         return this.updateResource(resource);
     }
     async readResource(resourceType, id) {
         const resource = __classPrivateFieldGet(this, _MemoryRepository_resources, "f")?.[resourceType]?.[id];
         if (!resource) {
-            throw notFound;
+            throw new OperationOutcomeError(notFound);
         }
         return deepClone(resource);
     }
     async readReference(reference) {
         const parts = reference.reference?.split('/');
         if (!parts || parts.length !== 2) {
-            throw badRequest('Invalid reference');
+            throw new OperationOutcomeError(badRequest('Invalid reference'));
         }
         return this.readResource(parts[0], parts[1]);
     }
@@ -14057,7 +14061,7 @@ class MemoryRepository {
         await this.readResource(resourceType, id);
         const version = __classPrivateFieldGet(this, _MemoryRepository_history, "f")?.[resourceType]?.[id]?.find((v) => v.meta?.versionId === versionId);
         if (!version) {
-            throw notFound;
+            throw new OperationOutcomeError(notFound);
         }
         return deepClone(version);
     }
@@ -14086,7 +14090,7 @@ class MemoryRepository {
     }
     async deleteResource(resourceType, id) {
         if (!__classPrivateFieldGet(this, _MemoryRepository_resources, "f")?.[resourceType]?.[id]) {
-            throw notFound;
+            throw new OperationOutcomeError(notFound);
         }
         delete __classPrivateFieldGet(this, _MemoryRepository_resources, "f")[resourceType][id];
     }