@oystehr/sdk 3.0.1 → 3.0.2

package/dist/esm/resources/classes/fhir-ext.d.ts

@@ -1,3 +1,5 @@
+import { Address as AddressR4B, HumanName as HumanNameR4B } from 'fhir/r4b';
+import { Address as AddressR5, HumanName as HumanNameR5 } from 'fhir/r5';
 import { BatchInput, Bundle, FhirCreateParams, FhirDeleteParams, FhirGetParams, FhirHistoryGetParams, FhirHistorySearchParams, FhirPatchParams, FhirResource, FhirSearchParams, FhirUpdateParams } from '../..';
 import { FhirFetcherResponse, OystehrClientRequest, SDKResource } from '../../client/client';
 /**
@@ -32,3 +34,14 @@ export declare function history<T extends FhirResource>(this: SDKResource, { res
 export declare function history<T extends FhirResource>(this: SDKResource, { resourceType, id, versionId }: FhirHistoryGetParams, request?: OystehrClientRequest): Promise<FhirFetcherResponse<T>>;
 export declare const batch: <BundleContentType extends FhirResource>(this: SDKResource, input: BatchInput<BundleContentType>, request?: OystehrClientRequest) => Promise<Bundle<BundleContentType>>;
 export declare const transaction: <BundleContentType extends FhirResource>(this: SDKResource, input: BatchInput<BundleContentType>, request?: OystehrClientRequest) => Promise<Bundle<BundleContentType>>;
+export declare function formatAddress(address: AddressR4B | AddressR5, options?: {
+    all?: boolean;
+    use?: boolean;
+    lineSeparator?: string;
+}): string;
+export declare function formatHumanName(name: HumanNameR4B | HumanNameR5, options?: {
+    all?: boolean;
+    prefix?: boolean;
+    suffix?: boolean;
+    use?: boolean;
+}): string;

package/dist/esm/resources/classes/fhir-ext.js

@@ -22,7 +22,7 @@ function search(params, request) {
             }, {});
         }
         const requestBundle = yield this.fhirRequest(`/${resourceType}/_search`, 'POST')(paramMap, Object.assign(Object.assign({}, request), { contentType: 'application/x-www-form-urlencoded' }));
-        const bundle = Object.assign(Object.assign({}, requestBundle), { unbundle: function () {
+        const bundle = Object.assign(Object.assign({}, requestBundle), { entry: requestBundle.entry, unbundle: function () {
                 var _a, _b;
                 return (_b = (_a = this.entry) === null || _a === void 0 ? void 0 : _a.map((entry) => entry.resource).filter((entry) => entry !== undefined)) !== null && _b !== void 0 ? _b : [];
             } });
@@ -126,6 +126,48 @@ function bundleRequest(type) {
 }
 const batch = bundleRequest('batch');
 const transaction = bundleRequest('transaction');
+function formatAddress(address, options) {
+    const builder = [];
+    if (address.line) {
+        builder.push(...address.line);
+    }
+    if (address.city || address.state || address.postalCode) {
+        const cityStateZip = [];
+        if (address.city) {
+            cityStateZip.push(address.city);
+        }
+        if (address.state) {
+            cityStateZip.push(address.state);
+        }
+        if (address.postalCode) {
+            cityStateZip.push(address.postalCode);
+        }
+        builder.push(cityStateZip.join(', '));
+    }
+    if (address.use && ((options === null || options === void 0 ? void 0 : options.all) || (options === null || options === void 0 ? void 0 : options.use))) {
+        builder.push('[' + address.use + ']');
+    }
+    return builder.join((options === null || options === void 0 ? void 0 : options.lineSeparator) || ', ').trim();
+}
+function formatHumanName(name, options) {
+    const builder = [];
+    if (name.prefix && (options === null || options === void 0 ? void 0 : options.prefix) !== false) {
+        builder.push(...name.prefix);
+    }
+    if (name.given) {
+        builder.push(...name.given);
+    }
+    if (name.family) {
+        builder.push(name.family);
+    }
+    if (name.suffix && (options === null || options === void 0 ? void 0 : options.suffix) !== false) {
+        builder.push(...name.suffix);
+    }
+    if (name.use && ((options === null || options === void 0 ? void 0 : options.all) || (options === null || options === void 0 ? void 0 : options.use))) {
+        builder.push('[' + name.use + ']');
+    }
+    return builder.join(' ').trim();
+}
 
-export { batch, create, del as delete, get, history, patch, search, transaction, update };
+export { batch, create, del as delete, formatAddress, formatHumanName, get, history, patch, search, transaction, update };
 //# sourceMappingURL=fhir-ext.js.map

package/dist/esm/resources/classes/fhir-ext.js.map

@@ -1 +1 @@
-{"version":3,"file":"fhir-ext.js","sources":["../../../../src/resources/classes/fhir-ext.ts"],"sourcesContent":["import {\n  BatchInput,\n  BatchInputRequest,\n  Binary,\n  Bundle,\n  BundleEntry,\n  FhirBundle,\n  FhirCreateParams,\n  FhirDeleteParams,\n  FhirGetParams,\n  FhirHistoryGetParams,\n  FhirHistorySearchParams,\n  FhirPatchParams,\n  FhirResource,\n  FhirSearchParams,\n  FhirUpdateParams,\n} from '../..';\nimport { addParamsToSearch, FhirFetcherResponse, OystehrClientRequest, SDKResource } from '../../client/client';\n\n/**\n * Optional parameter that can be passed to the client methods. It allows\n * overriding the access token or project ID, and setting various headers,\n * such as 'Content-Type'. Also support enabling optimistic locking.\n */\nexport interface OystehrFHIRUpdateClientRequest extends OystehrClientRequest {\n  /**\n   * Enable optimistic locking for the request. If set to a version ID, the request will\n   * include the 'If-Match' header with that value in the FHIR optimistic-locking format.\n   * If the resource has been updated since the version provided, the request\n   * will fail with a 412 Precondition Failed error.\n   */\n  optimisticLockingVersionId?: string;\n}\n\n/**\n * Performs a FHIR search and returns the results as a Bundle resource\n *\n * @param options FHIR resource type and FHIR search parameters\n * @param request optional OystehrClientRequest object\n * @returns FHIR Bundle resource\n */\nexport async function search<T extends FhirResource>(\n  this: SDKResource,\n  params: FhirSearchParams,\n  request?: OystehrClientRequest\n): Promise<FhirFetcherResponse<Bundle<T>>> {\n  const { resourceType, params: searchParams } = params;\n  let paramMap: Record<string, (string | number)[]> | undefined;\n  if (searchParams) {\n    paramMap = Object.entries(searchParams).reduce((acc, [_, param]) => {\n      if (!acc[param.name]) {\n        acc[param.name] = [];\n      }\n      acc[param.name].push(param.value);\n      return acc;\n    }, {} as Record<string, (string | number)[]>);\n  }\n  const requestBundle = await this.fhirRequest<FhirBundle<T>>(`/${resourceType}/_search`, 'POST')(paramMap, {\n    ...request,\n    contentType: 'application/x-www-form-urlencoded',\n  });\n  const bundle: Bundle<T> = {\n    ...requestBundle,\n    unbundle: function (this: Bundle<T>) {\n      return this.entry?.map((entry) => entry.resource).filter((entry): entry is T => entry !== undefined) ?? [];\n    },\n  };\n  return bundle;\n}\n\nexport async function create<T extends FhirResource>(\n  this: SDKResource,\n  params: FhirCreateParams<T>,\n  request?: OystehrClientRequest\n): Promise<FhirFetcherResponse<T>> {\n  const { resourceType } = params;\n  return this.fhirRequest(`/${resourceType}`, 'POST')(params as unknown as Record<string, unknown>, request);\n}\n\nexport async function get<T extends FhirResource>(\n  this: SDKResource,\n  { resourceType, id }: FhirGetParams,\n  request?: OystehrClientRequest\n): Promise<FhirFetcherResponse<T>> {\n  return this.fhirRequest<T>(`/${resourceType}/${id}`, 'GET')({}, request);\n}\n\nexport async function update<T extends FhirResource>(\n  this: SDKResource,\n  params: FhirUpdateParams<T>,\n  request?: OystehrFHIRUpdateClientRequest\n): Promise<FhirFetcherResponse<T>> {\n  const { id, resourceType } = params;\n  return this.fhirRequest(`/${resourceType}/${id}`, 'PUT')(params as unknown as Record<string, unknown>, {\n    ...request,\n    ifMatch: request?.optimisticLockingVersionId ? `W/\"${request.optimisticLockingVersionId}\"` : undefined,\n  });\n}\n\nexport async function patch<T extends FhirResource>(\n  this: SDKResource,\n  { resourceType, id, operations }: FhirPatchParams,\n  request?: OystehrFHIRUpdateClientRequest\n): Promise<FhirFetcherResponse<T>> {\n  return this.fhirRequest(`/${resourceType}/${id}`, 'PATCH')(operations, {\n    ...request,\n    contentType: 'application/json-patch+json',\n    ifMatch: request?.optimisticLockingVersionId ? `W/\"${request.optimisticLockingVersionId}\"` : undefined,\n  });\n}\n\nasync function del<T extends FhirResource>(\n  this: SDKResource,\n  { resourceType, id }: FhirDeleteParams,\n  request?: OystehrClientRequest\n): Promise<FhirFetcherResponse<T>> {\n  return this.fhirRequest(`/${resourceType}/${id}`, 'DELETE')({}, request);\n}\nexport { del as delete };\n\nexport async function history<T extends FhirResource>(\n  this: SDKResource,\n  { resourceType, id }: FhirHistorySearchParams,\n  request?: OystehrClientRequest\n): Promise<FhirFetcherResponse<Bundle<T>>>;\nexport async function history<T extends FhirResource>(\n  this: SDKResource,\n  { resourceType, id, versionId }: FhirHistoryGetParams,\n  request?: OystehrClientRequest\n): Promise<FhirFetcherResponse<T>>;\nexport async function history<T extends FhirResource>(\n  this: SDKResource,\n  { resourceType, id, versionId }: { resourceType: string; id: string; versionId?: string },\n  request?: OystehrClientRequest\n): Promise<FhirFetcherResponse<Bundle<T>> | FhirFetcherResponse<T>> {\n  return this.fhirRequest(`/${resourceType}/${id}/_history${versionId ? `/${versionId}` : ''}`, 'GET')({}, request);\n}\n\nfunction batchInputRequestToBundleEntryItem<T extends FhirResource>(\n  request: BatchInputRequest<T>\n): BundleEntry<T | Binary<T>> {\n  const { method, url } = request;\n  const baseRequest = {\n    request: {\n      method,\n      url,\n    },\n  };\n\n  // Escape query string parameters in entry.request.url\n  if (url.split('?').length > 1) {\n    const [resource, query] = url.split('?');\n    const params = query\n      .split('&')\n      .map((param) => {\n        const [name, value] = param.split('=');\n        return { name, value };\n      })\n      .reduce((acc, { name, value }) => {\n        acc[name] = value;\n        return acc;\n      }, {} as Record<string, string>);\n    const search = new URLSearchParams();\n    addParamsToSearch(params, search);\n    baseRequest.request.url = `${resource}?${search.toString()}`;\n  }\n\n  // GET, DELETE, and HEAD require no further parameters\n  if (['GET', 'DELETE', 'HEAD'].includes(method)) {\n    return baseRequest as BundleEntry<T>;\n  }\n\n  // PUT updates require a full resource\n  if (method === 'PUT') {\n    const { resource } = request;\n    return {\n      ...baseRequest,\n      resource: resource as T,\n    } as BundleEntry<T>;\n  }\n\n  // PATCH can be Binary resource or JSON patch\n  if (method === 'PATCH') {\n    if ('resource' in request) {\n      return {\n        ...baseRequest,\n        resource: request.resource,\n      } as BundleEntry<Binary<T>>;\n    }\n    return {\n      ...baseRequest,\n      resource: {\n        resourceType: 'Binary',\n        contentType: 'application/json-patch+json',\n        data: Buffer.from(JSON.stringify(request.operations), 'utf8').toString('base64'),\n      },\n    } as BundleEntry<Binary<T>>;\n  }\n\n  // POST creates require a full resource\n  if (method === 'POST') {\n    const { resource, fullUrl } = request;\n    return {\n      ...baseRequest,\n      resource: resource as T,\n      fullUrl,\n    } as BundleEntry<T>;\n  }\n  throw new Error('Unrecognized method');\n}\n\nfunction bundleRequest(type: 'batch' | 'transaction') {\n  return async function <BundleContentType extends FhirResource>(\n    this: SDKResource,\n    input: BatchInput<BundleContentType>,\n    request?: OystehrClientRequest\n  ): Promise<FhirFetcherResponse<Bundle<BundleContentType>>> {\n    return this.fhirRequest('/', 'POST')(\n      {\n        resourceType: 'Bundle',\n        type,\n        entry: input.requests.map(batchInputRequestToBundleEntryItem),\n      },\n      request\n    );\n  };\n}\n\nexport const batch = bundleRequest('batch');\nexport const transaction = bundleRequest('transaction');\n"],"names":[],"mappings":";;;AAkCA;;;;;;AAMG;AACmB,SAAA,MAAM,CAE1B,MAAwB,EACxB,OAA8B,EAAA;;QAE9B,MAAM,EAAE,YAAY,EAAE,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,CAAC;AACtD,QAAA,IAAI,QAAyD,CAAC;AAC9D,QAAA,IAAI,YAAY,EAAE;AAChB,YAAA,QAAQ,GAAG,MAAM,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,KAAI;AACjE,gBAAA,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE;AACpB,oBAAA,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;AACtB,iBAAA;AACD,gBAAA,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;AAClC,gBAAA,OAAO,GAAG,CAAC;aACZ,EAAE,EAAyC,CAAC,CAAC;AAC/C,SAAA;QACD,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC,WAAW,CAAgB,CAAI,CAAA,EAAA,YAAY,CAAU,QAAA,CAAA,EAAE,MAAM,CAAC,CAAC,QAAQ,EACnG,MAAA,CAAA,MAAA,CAAA,MAAA,CAAA,MAAA,CAAA,EAAA,EAAA,OAAO,KACV,WAAW,EAAE,mCAAmC,EAAA,CAAA,CAChD,CAAC;AACH,QAAA,MAAM,MAAM,GAAA,MAAA,CAAA,MAAA,CAAA,MAAA,CAAA,MAAA,CAAA,EAAA,EACP,aAAa,CAAA,EAAA,EAChB,QAAQ,EAAE,YAAA;;AACR,gBAAA,OAAO,CAAA,EAAA,GAAA,CAAA,EAAA,GAAA,IAAI,CAAC,KAAK,MAAA,IAAA,IAAA,EAAA,KAAA,KAAA,CAAA,GAAA,KAAA,CAAA,GAAA,EAAA,CAAE,GAAG,CAAC,CAAC,KAAK,KAAK,KAAK,CAAC,QAAQ,CAAA,CAAE,MAAM,CAAC,CAAC,KAAK,KAAiB,KAAK,KAAK,SAAS,CAAC,MAAA,IAAA,IAAA,EAAA,KAAA,KAAA,CAAA,GAAA,EAAA,GAAI,EAAE,CAAC;AAC7G,aAAC,GACF,CAAC;AACF,QAAA,OAAO,MAAM,CAAC;KACf,CAAA,CAAA;AAAA,CAAA;AAEqB,SAAA,MAAM,CAE1B,MAA2B,EAC3B,OAA8B,EAAA;;AAE9B,QAAA,MAAM,EAAE,YAAY,EAAE,GAAG,MAAM,CAAC;AAChC,QAAA,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,YAAY,CAAA,CAAE,EAAE,MAAM,CAAC,CAAC,MAA4C,EAAE,OAAO,CAAC,CAAC;KAC5G,CAAA,CAAA;AAAA,CAAA;AAEK,SAAgB,GAAG,CAEvB,EAAE,YAAY,EAAE,EAAE,EAAiB,EACnC,OAA8B,EAAA;;AAE9B,QAAA,OAAO,IAAI,CAAC,WAAW,CAAI,CAAA,CAAA,EAAI,YAAY,CAAI,CAAA,EAAA,EAAE,CAAE,CAAA,EAAE,KAAK,CAAC,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;KAC1E,CAAA,CAAA;AAAA,CAAA;AAEqB,SAAA,MAAM,CAE1B,MAA2B,EAC3B,OAAwC,EAAA;;AAExC,QAAA,MAAM,EAAE,EAAE,EAAE,YAAY,EAAE,GAAG,MAAM,CAAC;AACpC,QAAA,OAAO,IAAI,CAAC,WAAW,CAAC,CAAI,CAAA,EAAA,YAAY,IAAI,EAAE,CAAA,CAAE,EAAE,KAAK,CAAC,CAAC,MAA4C,kCAChG,OAAO,CAAA,EAAA,EACV,OAAO,EAAE,CAAA,OAAO,KAAA,IAAA,IAAP,OAAO,KAAP,KAAA,CAAA,GAAA,KAAA,CAAA,GAAA,OAAO,CAAE,0BAA0B,IAAG,CAAA,GAAA,EAAM,OAAO,CAAC,0BAA0B,CAAG,CAAA,CAAA,GAAG,SAAS,IACtG,CAAC;KACJ,CAAA,CAAA;AAAA,CAAA;AAEK,SAAgB,KAAK,CAEzB,EAAE,YAAY,EAAE,EAAE,EAAE,UAAU,EAAmB,EACjD,OAAwC,EAAA;;QAExC,OAAO,IAAI,CAAC,WAAW,CAAC,IAAI,YAAY,CAAA,CAAA,EAAI,EAAE,CAAE,CAAA,EAAE,OAAO,CAAC,CAAC,UAAU,EAChE,MAAA,CAAA,MAAA,CAAA,MAAA,CAAA,MAAA,CAAA,EAAA,EAAA,OAAO,KACV,WAAW,EAAE,6BAA6B,EAC1C,OAAO,EAAE,CAAA,OAAO,aAAP,OAAO,KAAA,KAAA,CAAA,GAAA,KAAA,CAAA,GAAP,OAAO,CAAE,0BAA0B,IAAG,MAAM,OAAO,CAAC,0BAA0B,CAAG,CAAA,CAAA,GAAG,SAAS,IACtG,CAAC;KACJ,CAAA,CAAA;AAAA,CAAA;AAED,SAAe,GAAG,CAEhB,EAAE,YAAY,EAAE,EAAE,EAAoB,EACtC,OAA8B,EAAA;;AAE9B,QAAA,OAAO,IAAI,CAAC,WAAW,CAAC,CAAA,CAAA,EAAI,YAAY,CAAI,CAAA,EAAA,EAAE,CAAE,CAAA,EAAE,QAAQ,CAAC,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;KAC1E,CAAA,CAAA;AAAA,CAAA;AAaK,SAAgB,OAAO,CAE3B,EAAE,YAAY,EAAE,EAAE,EAAE,SAAS,EAA4D,EACzF,OAA8B,EAAA;;AAE9B,QAAA,OAAO,IAAI,CAAC,WAAW,CAAC,CAAI,CAAA,EAAA,YAAY,CAAI,CAAA,EAAA,EAAE,CAAY,SAAA,EAAA,SAAS,GAAG,CAAA,CAAA,EAAI,SAAS,CAAA,CAAE,GAAG,EAAE,CAAE,CAAA,EAAE,KAAK,CAAC,CAAC,EAAE,EAAE,OAAO,CAAC,CAAC;KACnH,CAAA,CAAA;AAAA,CAAA;AAED,SAAS,kCAAkC,CACzC,OAA6B,EAAA;AAE7B,IAAA,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,CAAC;AAChC,IAAA,MAAM,WAAW,GAAG;AAClB,QAAA,OAAO,EAAE;YACP,MAAM;YACN,GAAG;AACJ,SAAA;KACF,CAAC;;IAGF,IAAI,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,MAAM,GAAG,CAAC,EAAE;AAC7B,QAAA,MAAM,CAAC,QAAQ,EAAE,KAAK,CAAC,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACzC,MAAM,MAAM,GAAG,KAAK;aACjB,KAAK,CAAC,GAAG,CAAC;AACV,aAAA,GAAG,CAAC,CAAC,KAAK,KAAI;AACb,YAAA,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;AACvC,YAAA,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC;AACzB,SAAC,CAAC;aACD,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,KAAI;AAC/B,YAAA,GAAG,CAAC,IAAI,CAAC,GAAG,KAAK,CAAC;AAClB,YAAA,OAAO,GAAG,CAAC;SACZ,EAAE,EAA4B,CAAC,CAAC;AACnC,QAAA,MAAM,MAAM,GAAG,IAAI,eAAe,EAAE,CAAC;AACrC,QAAA,iBAAiB,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;AAClC,QAAA,WAAW,CAAC,OAAO,CAAC,GAAG,GAAG,CAAA,EAAG,QAAQ,CAAA,CAAA,EAAI,MAAM,CAAC,QAAQ,EAAE,EAAE,CAAC;AAC9D,KAAA;;AAGD,IAAA,IAAI,CAAC,KAAK,EAAE,QAAQ,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE;AAC9C,QAAA,OAAO,WAA6B,CAAC;AACtC,KAAA;;IAGD,IAAI,MAAM,KAAK,KAAK,EAAE;AACpB,QAAA,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;AAC7B,QAAA,OAAO,gCACF,WAAW,CAAA,EAAA,EACd,QAAQ,EAAE,QAAa,GACN,CAAC;AACrB,KAAA;;IAGD,IAAI,MAAM,KAAK,OAAO,EAAE;QACtB,IAAI,UAAU,IAAI,OAAO,EAAE;YACzB,OAAO,MAAA,CAAA,MAAA,CAAA,MAAA,CAAA,MAAA,CAAA,EAAA,EACF,WAAW,CACd,EAAA,EAAA,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAA,CACD,CAAC;AAC7B,SAAA;AACD,QAAA,OAAO,MACF,CAAA,MAAA,CAAA,MAAA,CAAA,MAAA,CAAA,EAAA,EAAA,WAAW,CACd,EAAA,EAAA,QAAQ,EAAE;AACR,gBAAA,YAAY,EAAE,QAAQ;AACtB,gBAAA,WAAW,EAAE,6BAA6B;gBAC1C,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC;AACjF,aAAA,EAAA,CACwB,CAAC;AAC7B,KAAA;;IAGD,IAAI,MAAM,KAAK,MAAM,EAAE;AACrB,QAAA,MAAM,EAAE,QAAQ,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;QACtC,OAAO,MAAA,CAAA,MAAA,CAAA,MAAA,CAAA,MAAA,CAAA,EAAA,EACF,WAAW,CACd,EAAA,EAAA,QAAQ,EAAE,QAAa,EACvB,OAAO,EAAA,CACU,CAAC;AACrB,KAAA;AACD,IAAA,MAAM,IAAI,KAAK,CAAC,qBAAqB,CAAC,CAAC;AACzC,CAAC;AAED,SAAS,aAAa,CAAC,IAA6B,EAAA;IAClD,OAAO,UAEL,KAAoC,EACpC,OAA8B,EAAA;;YAE9B,OAAO,IAAI,CAAC,WAAW,CAAC,GAAG,EAAE,MAAM,CAAC,CAClC;AACE,gBAAA,YAAY,EAAE,QAAQ;gBACtB,IAAI;gBACJ,KAAK,EAAE,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,kCAAkC,CAAC;aAC9D,EACD,OAAO,CACR,CAAC;SACH,CAAA,CAAA;KAAA,CAAC;AACJ,CAAC;MAEY,KAAK,GAAG,aAAa,CAAC,OAAO,EAAE;MAC/B,WAAW,GAAG,aAAa,CAAC,aAAa;;;;"}
+{"version":3,"file":"fhir-ext.js","sources":["../../../../src/resources/classes/fhir-ext.ts"],"sourcesContent":["import { Address as AddressR4B, HumanName as HumanNameR4B } from 'fhir/r4b';\nimport { Address as AddressR5, HumanName as HumanNameR5 } from 'fhir/r5';\nimport {\n  BatchInput,\n  BatchInputRequest,\n  Binary,\n  Bundle,\n  BundleEntry,\n  FhirBundle,\n  FhirCreateParams,\n  FhirDeleteParams,\n  FhirGetParams,\n  FhirHistoryGetParams,\n  FhirHistorySearchParams,\n  FhirPatchParams,\n  FhirResource,\n  FhirSearchParams,\n  FhirUpdateParams,\n} from '../..';\nimport { addParamsToSearch, FhirFetcherResponse, OystehrClientRequest, SDKResource } from '../../client/client';\n\n/**\n * Optional parameter that can be passed to the client methods. It allows\n * overriding the access token or project ID, and setting various headers,\n * such as 'Content-Type'. Also support enabling optimistic locking.\n */\nexport interface OystehrFHIRUpdateClientRequest extends OystehrClientRequest {\n  /**\n   * Enable optimistic locking for the request. If set to a version ID, the request will\n   * include the 'If-Match' header with that value in the FHIR optimistic-locking format.\n   * If the resource has been updated since the version provided, the request\n   * will fail with a 412 Precondition Failed error.\n   */\n  optimisticLockingVersionId?: string;\n}\n\n/**\n * Performs a FHIR search and returns the results as a Bundle resource\n *\n * @param options FHIR resource type and FHIR search parameters\n * @param request optional OystehrClientRequest object\n * @returns FHIR Bundle resource\n */\nexport async function search<T extends FhirResource>(\n  this: SDKResource,\n  params: FhirSearchParams,\n  request?: OystehrClientRequest\n): Promise<FhirFetcherResponse<Bundle<T>>> {\n  const { resourceType, params: searchParams } = params;\n  let paramMap: Record<string, (string | number)[]> | undefined;\n  if (searchParams) {\n    paramMap = Object.entries(searchParams).reduce((acc, [_, param]) => {\n      if (!acc[param.name]) {\n        acc[param.name] = [];\n      }\n      acc[param.name].push(param.value);\n      return acc;\n    }, {} as Record<string, (string | number)[]>);\n  }\n  const requestBundle = await this.fhirRequest<FhirBundle<T>>(`/${resourceType}/_search`, 'POST')(paramMap, {\n    ...request,\n    contentType: 'application/x-www-form-urlencoded',\n  });\n  const bundle: Bundle<T> = {\n    ...requestBundle,\n    entry: requestBundle.entry as Array<BundleEntry<T>> | undefined,\n    unbundle: function (this: { entry?: Array<BundleEntry<T>> | undefined }) {\n      return this.entry?.map((entry) => entry.resource).filter((entry): entry is T => entry !== undefined) ?? [];\n    },\n  };\n  return bundle;\n}\n\nexport async function create<T extends FhirResource>(\n  this: SDKResource,\n  params: FhirCreateParams<T>,\n  request?: OystehrClientRequest\n): Promise<FhirFetcherResponse<T>> {\n  const { resourceType } = params;\n  return this.fhirRequest(`/${resourceType}`, 'POST')(params as unknown as Record<string, unknown>, request);\n}\n\nexport async function get<T extends FhirResource>(\n  this: SDKResource,\n  { resourceType, id }: FhirGetParams,\n  request?: OystehrClientRequest\n): Promise<FhirFetcherResponse<T>> {\n  return this.fhirRequest<T>(`/${resourceType}/${id}`, 'GET')({}, request);\n}\n\nexport async function update<T extends FhirResource>(\n  this: SDKResource,\n  params: FhirUpdateParams<T>,\n  request?: OystehrFHIRUpdateClientRequest\n): Promise<FhirFetcherResponse<T>> {\n  const { id, resourceType } = params;\n  return this.fhirRequest(`/${resourceType}/${id}`, 'PUT')(params as unknown as Record<string, unknown>, {\n    ...request,\n    ifMatch: request?.optimisticLockingVersionId ? `W/\"${request.optimisticLockingVersionId}\"` : undefined,\n  });\n}\n\nexport async function patch<T extends FhirResource>(\n  this: SDKResource,\n  { resourceType, id, operations }: FhirPatchParams,\n  request?: OystehrFHIRUpdateClientRequest\n): Promise<FhirFetcherResponse<T>> {\n  return this.fhirRequest(`/${resourceType}/${id}`, 'PATCH')(operations, {\n    ...request,\n    contentType: 'application/json-patch+json',\n    ifMatch: request?.optimisticLockingVersionId ? `W/\"${request.optimisticLockingVersionId}\"` : undefined,\n  });\n}\n\nasync function del<T extends FhirResource>(\n  this: SDKResource,\n  { resourceType, id }: FhirDeleteParams,\n  request?: OystehrClientRequest\n): Promise<FhirFetcherResponse<T>> {\n  return this.fhirRequest(`/${resourceType}/${id}`, 'DELETE')({}, request);\n}\nexport { del as delete };\n\nexport async function history<T extends FhirResource>(\n  this: SDKResource,\n  { resourceType, id }: FhirHistorySearchParams,\n  request?: OystehrClientRequest\n): Promise<FhirFetcherResponse<Bundle<T>>>;\nexport async function history<T extends FhirResource>(\n  this: SDKResource,\n  { resourceType, id, versionId }: FhirHistoryGetParams,\n  request?: OystehrClientRequest\n): Promise<FhirFetcherResponse<T>>;\nexport async function history<T extends FhirResource>(\n  this: SDKResource,\n  { resourceType, id, versionId }: { resourceType: string; id: string; versionId?: string },\n  request?: OystehrClientRequest\n): Promise<FhirFetcherResponse<Bundle<T>> | FhirFetcherResponse<T>> {\n  return this.fhirRequest(`/${resourceType}/${id}/_history${versionId ? `/${versionId}` : ''}`, 'GET')({}, request);\n}\n\nfunction batchInputRequestToBundleEntryItem<T extends FhirResource>(\n  request: BatchInputRequest<T>\n): BundleEntry<T | Binary<T>> {\n  const { method, url } = request;\n  const baseRequest = {\n    request: {\n      method,\n      url,\n    },\n  };\n\n  // Escape query string parameters in entry.request.url\n  if (url.split('?').length > 1) {\n    const [resource, query] = url.split('?');\n    const params = query\n      .split('&')\n      .map((param) => {\n        const [name, value] = param.split('=');\n        return { name, value };\n      })\n      .reduce((acc, { name, value }) => {\n        acc[name] = value;\n        return acc;\n      }, {} as Record<string, string>);\n    const search = new URLSearchParams();\n    addParamsToSearch(params, search);\n    baseRequest.request.url = `${resource}?${search.toString()}`;\n  }\n\n  // GET, DELETE, and HEAD require no further parameters\n  if (['GET', 'DELETE', 'HEAD'].includes(method)) {\n    return baseRequest as BundleEntry<T>;\n  }\n\n  // PUT updates require a full resource\n  if (method === 'PUT') {\n    const { resource } = request;\n    return {\n      ...baseRequest,\n      resource: resource as T,\n    } as BundleEntry<T>;\n  }\n\n  // PATCH can be Binary resource or JSON patch\n  if (method === 'PATCH') {\n    if ('resource' in request) {\n      return {\n        ...baseRequest,\n        resource: request.resource,\n      } as BundleEntry<Binary<T>>;\n    }\n    return {\n      ...baseRequest,\n      resource: {\n        resourceType: 'Binary',\n        contentType: 'application/json-patch+json',\n        data: Buffer.from(JSON.stringify(request.operations), 'utf8').toString('base64'),\n      },\n    } as BundleEntry<Binary<T>>;\n  }\n\n  // POST creates require a full resource\n  if (method === 'POST') {\n    const { resource, fullUrl } = request;\n    return {\n      ...baseRequest,\n      resource: resource as T,\n      fullUrl,\n    } as BundleEntry<T>;\n  }\n  throw new Error('Unrecognized method');\n}\n\nfunction bundleRequest(type: 'batch' | 'transaction') {\n  return async function <BundleContentType extends FhirResource>(\n    this: SDKResource,\n    input: BatchInput<BundleContentType>,\n    request?: OystehrClientRequest\n  ): Promise<FhirFetcherResponse<Bundle<BundleContentType>>> {\n    return this.fhirRequest('/', 'POST')(\n      {\n        resourceType: 'Bundle',\n        type,\n        entry: input.requests.map(batchInputRequestToBundleEntryItem),\n      },\n      request\n    );\n  };\n}\n\nexport const batch = bundleRequest('batch');\nexport const transaction = bundleRequest('transaction');\n\nexport function formatAddress(\n  address: AddressR4B | AddressR5,\n  options?: { all?: boolean; use?: boolean; lineSeparator?: string }\n): string {\n  const builder = [];\n\n  if (address.line) {\n    builder.push(...address.line);\n  }\n\n  if (address.city || address.state || address.postalCode) {\n    const cityStateZip = [];\n    if (address.city) {\n      cityStateZip.push(address.city);\n    }\n    if (address.state) {\n      cityStateZip.push(address.state);\n    }\n    if (address.postalCode) {\n      cityStateZip.push(address.postalCode);\n    }\n    builder.push(cityStateZip.join(', '));\n  }\n\n  if (address.use && (options?.all || options?.use)) {\n    builder.push('[' + address.use + ']');\n  }\n\n  return builder.join(options?.lineSeparator || ', ').trim();\n}\n\nexport function formatHumanName(\n  name: HumanNameR4B | HumanNameR5,\n  options?: {\n    all?: boolean;\n    prefix?: boolean;\n    suffix?: boolean;\n    use?: boolean;\n  }\n): string {\n  const builder = [];\n\n  if (name.prefix && options?.prefix !== false) {\n    builder.push(...name.prefix);\n  }\n\n  if (name.given) {\n    builder.push(...name.given);\n  }\n\n  if (name.family) {\n    builder.push(name.family);\n  }\n\n  if (name.suffix && options?.suffix !== false) {\n    builder.push(...name.suffix);\n  }\n\n  if (name.use && (options?.all || options?.use)) {\n    builder.push('[' + name.use + ']');\n  }\n\n  return builder.join(' ').trim();\n}\n"],"names":[],"mappings":"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"}

package/dist/esm/resources/classes/fhir.d.ts

@@ -18,4 +18,6 @@ export declare class Fhir extends SDKResource {
     history: typeof ext.history;
     batch: <BundleContentType extends import("..").FhirResource>(this: SDKResource, input: import("..").BatchInput<BundleContentType>, request?: import("../../client/client").OystehrClientRequest | undefined) => Promise<import("..").Bundle<BundleContentType>>;
     transaction: <BundleContentType extends import("..").FhirResource>(this: SDKResource, input: import("..").BatchInput<BundleContentType>, request?: import("../../client/client").OystehrClientRequest | undefined) => Promise<import("..").Bundle<BundleContentType>>;
+    formatAddress: typeof ext.formatAddress;
+    formatHumanName: typeof ext.formatHumanName;
 }

package/dist/esm/resources/classes/fhir.js

@@ -1,5 +1,5 @@
 import { SDKResource } from '../../client/client.js';
-import { search, create, get, update, patch, delete as del, history, batch, transaction } from './fhir-ext.js';
+import { search, create, get, update, patch, delete as del, history, batch, transaction, formatAddress, formatHumanName } from './fhir-ext.js';
 
 // AUTOGENERATED -- DO NOT EDIT
 class Fhir extends SDKResource {
@@ -20,6 +20,8 @@ class Fhir extends SDKResource {
         this.history = history;
         this.batch = batch;
         this.transaction = transaction;
+        this.formatAddress = formatAddress;
+        this.formatHumanName = formatHumanName;
     }
 }
 

package/dist/esm/resources/classes/fhir.js.map

@@ -1 +1 @@
-{"version":3,"file":"fhir.js","sources":["../../../../src/resources/classes/fhir.ts"],"sourcesContent":["// AUTOGENERATED -- DO NOT EDIT\n\nimport { SDKResource } from '../../client/client';\nimport { OystehrConfig } from '../../config';\nimport * as ext from './fhir-ext';\n\nexport class Fhir extends SDKResource {\n  constructor(config: OystehrConfig) {\n    super(config);\n  }\n  /**\n   * Performs a FHIR search and returns the results as a Bundle resource\n   * @param options FHIR resource type and FHIR search parameters\n   * @param request optional OystehrClientRequest object\n   * @returns FHIR Bundle resource\n   */\n  search = ext.search;\n  create = ext.create;\n  get = ext.get;\n  update = ext.update;\n  patch = ext.patch;\n  delete = ext.delete;\n  history = ext.history;\n  batch = ext.batch;\n  transaction = ext.transaction;\n}\n"],"names":["ext.search","ext.create","ext.get","ext.update","ext.patch","ext.delete","ext.history","ext.batch","ext.transaction"],"mappings":";;;AAAA;AAMM,MAAO,IAAK,SAAQ,WAAW,CAAA;AACnC,IAAA,WAAA,CAAY,MAAqB,EAAA;QAC/B,KAAK,CAAC,MAAM,CAAC,CAAC;AAEhB;;;;;AAKG;AACH,QAAA,IAAA,CAAA,MAAM,GAAGA,MAAU,CAAC;AACpB,QAAA,IAAA,CAAA,MAAM,GAAGC,MAAU,CAAC;AACpB,QAAA,IAAA,CAAA,GAAG,GAAGC,GAAO,CAAC;AACd,QAAA,IAAA,CAAA,MAAM,GAAGC,MAAU,CAAC;AACpB,QAAA,IAAA,CAAA,KAAK,GAAGC,KAAS,CAAC;AAClB,QAAA,IAAA,CAAA,MAAM,GAAGC,GAAU,CAAC;AACpB,QAAA,IAAA,CAAA,OAAO,GAAGC,OAAW,CAAC;AACtB,QAAA,IAAA,CAAA,KAAK,GAAGC,KAAS,CAAC;AAClB,QAAA,IAAA,CAAA,WAAW,GAAGC,WAAe,CAAC;KAf7B;AAgBF;;;;"}
+{"version":3,"file":"fhir.js","sources":["../../../../src/resources/classes/fhir.ts"],"sourcesContent":["// AUTOGENERATED -- DO NOT EDIT\n\nimport { SDKResource } from '../../client/client';\nimport { OystehrConfig } from '../../config';\nimport * as ext from './fhir-ext';\n\nexport class Fhir extends SDKResource {\n  constructor(config: OystehrConfig) {\n    super(config);\n  }\n  /**\n   * Performs a FHIR search and returns the results as a Bundle resource\n   * @param options FHIR resource type and FHIR search parameters\n   * @param request optional OystehrClientRequest object\n   * @returns FHIR Bundle resource\n   */\n  search = ext.search;\n  create = ext.create;\n  get = ext.get;\n  update = ext.update;\n  patch = ext.patch;\n  delete = ext.delete;\n  history = ext.history;\n  batch = ext.batch;\n  transaction = ext.transaction;\n  formatAddress = ext.formatAddress;\n  formatHumanName = ext.formatHumanName;\n}\n"],"names":["ext.search","ext.create","ext.get","ext.update","ext.patch","ext.delete","ext.history","ext.batch","ext.transaction","ext.formatAddress","ext.formatHumanName"],"mappings":";;;AAAA;AAMM,MAAO,IAAK,SAAQ,WAAW,CAAA;AACnC,IAAA,WAAA,CAAY,MAAqB,EAAA;QAC/B,KAAK,CAAC,MAAM,CAAC,CAAC;AAEhB;;;;;AAKG;AACH,QAAA,IAAA,CAAA,MAAM,GAAGA,MAAU,CAAC;AACpB,QAAA,IAAA,CAAA,MAAM,GAAGC,MAAU,CAAC;AACpB,QAAA,IAAA,CAAA,GAAG,GAAGC,GAAO,CAAC;AACd,QAAA,IAAA,CAAA,MAAM,GAAGC,MAAU,CAAC;AACpB,QAAA,IAAA,CAAA,KAAK,GAAGC,KAAS,CAAC;AAClB,QAAA,IAAA,CAAA,MAAM,GAAGC,GAAU,CAAC;AACpB,QAAA,IAAA,CAAA,OAAO,GAAGC,OAAW,CAAC;AACtB,QAAA,IAAA,CAAA,KAAK,GAAGC,KAAS,CAAC;AAClB,QAAA,IAAA,CAAA,WAAW,GAAGC,WAAe,CAAC;AAC9B,QAAA,IAAA,CAAA,aAAa,GAAGC,aAAiB,CAAC;AAClC,QAAA,IAAA,CAAA,eAAe,GAAGC,eAAmB,CAAC;KAjBrC;AAkBF;;;;"}

package/dist/esm/resources/types/ZambdaCreateParams.d.ts

@@ -7,6 +7,6 @@ export interface ZambdaCreateParams {
     /**
      * The trigger method for the Zambda Function determines how the Function is invoked. Learn more about the different types here, https://docs.oystehr.com/services/zambda/#types-of-zambdas.
      */
-    triggerMethod: 'http_auth' | 'http_open' | 'subscription' | 'cron';
+    triggerMethod?: 'http_auth' | 'http_open' | 'subscription' | 'cron';
     schedule?: ZambdaSchedule;
 }

package/dist/esm/resources/types/fhir.d.ts

@@ -2,10 +2,13 @@ import type { Operation } from 'fast-json-patch';
 import type { Binary as BinaryR4B, Bundle as BundleR4B, BundleEntry as BundleEntryR4B, FhirResource as FhirResourceR4B, OperationOutcome as OperationOutcomeR4B } from 'fhir/r4b';
 import type { Binary as BinaryR5, Bundle as BundleR5, BundleEntry as BundleEntryR5, FhirResource as FhirResourceR5, OperationOutcome as OperationOutcomeR5 } from 'fhir/r5';
 export type FhirResource = FhirResourceR4B | FhirResourceR5;
-export type FhirBundle<F extends FhirResource> = F extends FhirResourceR4B ? Omit<BundleR4B<F>, 'entry'> : Omit<BundleR5<F>, 'entry'>;
-export type Bundle<F extends FhirResource> = FhirBundle<F> & {
+export type FhirBundle<F extends FhirResource> = F extends FhirResourceR4B ? BundleR4B<F> : BundleR5<F>;
+export type EntrylessFhirBundle<F extends FhirResource> = F extends FhirResourceR4B ? Omit<BundleR4B<F>, 'entry'> : Omit<BundleR5<F>, 'entry'>;
+export type Bundle<F extends FhirResource> = EntrylessFhirBundle<F> & {
     entry?: Array<BundleEntry<F>> | undefined;
-    unbundle: (this: Bundle<F>) => F[];
+    unbundle: (this: {
+        entry?: Array<BundleEntry<F>>;
+    }) => F[];
 };
 export type BundleEntry<F extends FhirResource> = F extends FhirResourceR4B ? BundleEntryR4B<F> : BundleEntryR5<F>;
 export type Binary<F extends FhirResource> = F extends FhirResourceR4B ? BinaryR4B : BinaryR5;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oystehr/sdk",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "description": "Oystehr SDK",
   "scripts": {
     "lint": "eslint .",

package/src/resources/classes/fhir-ext.ts

@@ -1,3 +1,5 @@
+import { Address as AddressR4B, HumanName as HumanNameR4B } from 'fhir/r4b';
+import { Address as AddressR5, HumanName as HumanNameR5 } from 'fhir/r5';
 import {
   BatchInput,
   BatchInputRequest,
@@ -61,7 +63,8 @@ export async function search<T extends FhirResource>(
   });
   const bundle: Bundle<T> = {
     ...requestBundle,
-    unbundle: function (this: Bundle<T>) {
+    entry: requestBundle.entry as Array<BundleEntry<T>> | undefined,
+    unbundle: function (this: { entry?: Array<BundleEntry<T>> | undefined }) {
       return this.entry?.map((entry) => entry.resource).filter((entry): entry is T => entry !== undefined) ?? [];
     },
   };
@@ -228,3 +231,68 @@ function bundleRequest(type: 'batch' | 'transaction') {
 
 export const batch = bundleRequest('batch');
 export const transaction = bundleRequest('transaction');
+
+export function formatAddress(
+  address: AddressR4B | AddressR5,
+  options?: { all?: boolean; use?: boolean; lineSeparator?: string }
+): string {
+  const builder = [];
+
+  if (address.line) {
+    builder.push(...address.line);
+  }
+
+  if (address.city || address.state || address.postalCode) {
+    const cityStateZip = [];
+    if (address.city) {
+      cityStateZip.push(address.city);
+    }
+    if (address.state) {
+      cityStateZip.push(address.state);
+    }
+    if (address.postalCode) {
+      cityStateZip.push(address.postalCode);
+    }
+    builder.push(cityStateZip.join(', '));
+  }
+
+  if (address.use && (options?.all || options?.use)) {
+    builder.push('[' + address.use + ']');
+  }
+
+  return builder.join(options?.lineSeparator || ', ').trim();
+}
+
+export function formatHumanName(
+  name: HumanNameR4B | HumanNameR5,
+  options?: {
+    all?: boolean;
+    prefix?: boolean;
+    suffix?: boolean;
+    use?: boolean;
+  }
+): string {
+  const builder = [];
+
+  if (name.prefix && options?.prefix !== false) {
+    builder.push(...name.prefix);
+  }
+
+  if (name.given) {
+    builder.push(...name.given);
+  }
+
+  if (name.family) {
+    builder.push(name.family);
+  }
+
+  if (name.suffix && options?.suffix !== false) {
+    builder.push(...name.suffix);
+  }
+
+  if (name.use && (options?.all || options?.use)) {
+    builder.push('[' + name.use + ']');
+  }
+
+  return builder.join(' ').trim();
+}

package/src/resources/classes/fhir.ts

@@ -23,4 +23,6 @@ export class Fhir extends SDKResource {
   history = ext.history;
   batch = ext.batch;
   transaction = ext.transaction;
+  formatAddress = ext.formatAddress;
+  formatHumanName = ext.formatHumanName;
 }

package/src/resources/types/ZambdaCreateParams.ts

@@ -10,6 +10,6 @@ export interface ZambdaCreateParams {
   /**
    * The trigger method for the Zambda Function determines how the Function is invoked. Learn more about the different types here, https://docs.oystehr.com/services/zambda/#types-of-zambdas.
    */
-  triggerMethod: 'http_auth' | 'http_open' | 'subscription' | 'cron';
+  triggerMethod?: 'http_auth' | 'http_open' | 'subscription' | 'cron';
   schedule?: ZambdaSchedule;
 }

package/src/resources/types/fhir.ts

@@ -26,12 +26,13 @@ export type FhirResource = FhirResourceR4B | FhirResourceR5;
 // entry: (BundleEntry<Patient> | BundleEntry<Practitioner>)[] | undefined
 //
 // The latter can be used with array functions like `.find()`.
-export type FhirBundle<F extends FhirResource> = F extends FhirResourceR4B
+export type FhirBundle<F extends FhirResource> = F extends FhirResourceR4B ? BundleR4B<F> : BundleR5<F>;
+export type EntrylessFhirBundle<F extends FhirResource> = F extends FhirResourceR4B
   ? Omit<BundleR4B<F>, 'entry'>
   : Omit<BundleR5<F>, 'entry'>;
-export type Bundle<F extends FhirResource> = FhirBundle<F> & {
+export type Bundle<F extends FhirResource> = EntrylessFhirBundle<F> & {
   entry?: Array<BundleEntry<F>> | undefined;
-  unbundle: (this: Bundle<F>) => F[];
+  unbundle: (this: { entry?: Array<BundleEntry<F>> }) => F[];
 };
 export type BundleEntry<F extends FhirResource> = F extends FhirResourceR4B ? BundleEntryR4B<F> : BundleEntryR5<F>;
 export type Binary<F extends FhirResource> = F extends FhirResourceR4B ? BinaryR4B : BinaryR5;

package/dist/cjs/fhir/fhir-types.d.ts

@@ -1,9 +0,0 @@
-import * as R4B from 'fhir/r4b';
-import * as R5 from 'fhir/r5';
-export type Binary = R4B.Binary | R5.Binary;
-export type FhirResource = R4B.FhirResource | R5.FhirResource;
-export type Resource = R4B.Resource | R5.Resource;
-export type Bundle<BundleContentType = FhirResource> = R4B.Bundle<BundleContentType> | R5.Bundle<BundleContentType>;
-export type BundleEntry<BundleContentType = FhirResource> = R4B.BundleEntry<BundleContentType> | R5.BundleEntry<BundleContentType>;
-export type Address = R4B.Address | R5.Address;
-export type HumanName = R4B.HumanName | R5.HumanName;

package/dist/cjs/fhir/index.d.ts

@@ -1,2 +0,0 @@
-export * from './utils';
-export * from './fhir-types';

package/dist/cjs/fhir/utils.d.ts

@@ -1,14 +0,0 @@
-import { Address, HumanName } from './fhir-types';
-export interface AddressFormatOptions {
-    all?: boolean;
-    use?: boolean;
-    lineSeparator?: string;
-}
-export interface HumanNameFormatOptions {
-    all?: boolean;
-    prefix?: boolean;
-    suffix?: boolean;
-    use?: boolean;
-}
-export declare function formatAddress(address: Address, options?: AddressFormatOptions): string;
-export declare function formatHumanName(name: HumanName, options?: HumanNameFormatOptions): string;

package/dist/esm/fhir/fhir-types.d.ts

@@ -1,9 +0,0 @@
-import * as R4B from 'fhir/r4b';
-import * as R5 from 'fhir/r5';
-export type Binary = R4B.Binary | R5.Binary;
-export type FhirResource = R4B.FhirResource | R5.FhirResource;
-export type Resource = R4B.Resource | R5.Resource;
-export type Bundle<BundleContentType = FhirResource> = R4B.Bundle<BundleContentType> | R5.Bundle<BundleContentType>;
-export type BundleEntry<BundleContentType = FhirResource> = R4B.BundleEntry<BundleContentType> | R5.BundleEntry<BundleContentType>;
-export type Address = R4B.Address | R5.Address;
-export type HumanName = R4B.HumanName | R5.HumanName;

package/dist/esm/fhir/index.d.ts

@@ -1,2 +0,0 @@
-export * from './utils';
-export * from './fhir-types';

package/dist/esm/fhir/utils.d.ts

@@ -1,14 +0,0 @@
-import { Address, HumanName } from './fhir-types';
-export interface AddressFormatOptions {
-    all?: boolean;
-    use?: boolean;
-    lineSeparator?: string;
-}
-export interface HumanNameFormatOptions {
-    all?: boolean;
-    prefix?: boolean;
-    suffix?: boolean;
-    use?: boolean;
-}
-export declare function formatAddress(address: Address, options?: AddressFormatOptions): string;
-export declare function formatHumanName(name: HumanName, options?: HumanNameFormatOptions): string;

package/src/fhir/fhir-types.ts

@@ -1,15 +0,0 @@
-import * as R4B from 'fhir/r4b';
-import * as R5 from 'fhir/r5';
-
-// Resources
-export type Binary = R4B.Binary | R5.Binary;
-export type FhirResource = R4B.FhirResource | R5.FhirResource;
-export type Resource = R4B.Resource | R5.Resource;
-export type Bundle<BundleContentType = FhirResource> = R4B.Bundle<BundleContentType> | R5.Bundle<BundleContentType>;
-export type BundleEntry<BundleContentType = FhirResource> =
-  | R4B.BundleEntry<BundleContentType>
-  | R5.BundleEntry<BundleContentType>;
-
-// DataTypes
-export type Address = R4B.Address | R5.Address;
-export type HumanName = R4B.HumanName | R5.HumanName;

package/src/fhir/index.ts

@@ -1,2 +0,0 @@
-export * from './utils';
-export * from './fhir-types';

package/src/fhir/utils.ts

@@ -1,68 +0,0 @@
-import { Address, HumanName } from './fhir-types';
-
-export interface AddressFormatOptions {
-  all?: boolean;
-  use?: boolean;
-  lineSeparator?: string;
-}
-
-export interface HumanNameFormatOptions {
-  all?: boolean;
-  prefix?: boolean;
-  suffix?: boolean;
-  use?: boolean;
-}
-
-export function formatAddress(address: Address, options?: AddressFormatOptions): string {
-  const builder = [];
-
-  if (address.line) {
-    builder.push(...address.line);
-  }
-
-  if (address.city || address.state || address.postalCode) {
-    const cityStateZip = [];
-    if (address.city) {
-      cityStateZip.push(address.city);
-    }
-    if (address.state) {
-      cityStateZip.push(address.state);
-    }
-    if (address.postalCode) {
-      cityStateZip.push(address.postalCode);
-    }
-    builder.push(cityStateZip.join(', '));
-  }
-
-  if (address.use && (options?.all || options?.use)) {
-    builder.push('[' + address.use + ']');
-  }
-
-  return builder.join(options?.lineSeparator || ', ').trim();
-}
-
-export function formatHumanName(name: HumanName, options?: HumanNameFormatOptions): string {
-  const builder = [];
-
-  if (name.prefix && options?.prefix !== false) {
-    builder.push(...name.prefix);
-  }
-
-  if (name.given) {
-    builder.push(...name.given);
-  }
-
-  if (name.family) {
-    builder.push(name.family);
-  }
-
-  if (name.suffix && options?.suffix !== false) {
-    builder.push(...name.suffix);
-  }
-
-  if (name.use && (options?.all || options?.use)) {
-    builder.push('[' + name.use + ']');
-  }
-
-  return builder.join(' ').trim();
-}