@openmrs/esm-api 4.0.0-pre.0 → 4.0.0-pre.1

package/.turbo/turbo-build.log

@@ -1,4 +1,4 @@
-@openmrs/esm-api:build: cache hit, replaying output 18f95a77d799268c
+@openmrs/esm-api:build: cache hit, replaying output d06da1e868c409be
 @openmrs/esm-api:build: $ webpack --mode=production
 @openmrs/esm-api:build: asset openmrs-esm-api.js 49.5 KiB [emitted] [minimized] (name: main) 1 related asset
 @openmrs/esm-api:build: orphan modules 369 KiB [orphan] 226 modules
@@ -15,4 +15,4 @@
 @openmrs/esm-api:build:     external "@openmrs/esm-error-handling" 42 bytes [built] [code generated]
 @openmrs/esm-api:build:   ./src/index.ts + 44 modules 80.9 KiB [built] [code generated]
 @openmrs/esm-api:build:   ../esm-state/dist/openmrs-esm-state.js 7.52 KiB [built] [code generated]
-@openmrs/esm-api:build: webpack 5.70.0 compiled successfully in 4484 ms
+@openmrs/esm-api:build: webpack 5.70.0 compiled successfully in 15910 ms

package/.turbo/turbo-lint.log

@@ -1,2 +1,2 @@
-@openmrs/esm-api:lint: cache hit, replaying output d60aaa80b2f4de05
+@openmrs/esm-api:lint: cache hit, replaying output fb791d3f24afca66
 @openmrs/esm-api:lint: $ eslint src --ext ts,tsx

package/.turbo/turbo-test.log

@@ -1,10 +1,10 @@
-@openmrs/esm-api:test: cache hit, replaying output a92031ffe5e66814
-@openmrs/esm-api:test: $ jest --config jest.config.js --passWithNoTests
-@openmrs/esm-api:test: PASS src/openmrs-fetch.test.ts
-@openmrs/esm-api:test: PASS src/shared-api-objects/current-patient.test.ts
-@openmrs/esm-api:test: 
-@openmrs/esm-api:test: Test Suites: 2 passed, 2 total
-@openmrs/esm-api:test: Tests:       17 passed, 17 total
-@openmrs/esm-api:test: Snapshots:   0 total
-@openmrs/esm-api:test: Time:        9.243 s
-@openmrs/esm-api:test: Ran all test suites.
+@openmrs/esm-api:test: cache hit, replaying output 7d1ce0a34fe1a30c
+@openmrs/esm-api:test: $ jest --config jest.config.js --passWithNoTests
+@openmrs/esm-api:test: PASS src/shared-api-objects/current-patient.test.ts
+@openmrs/esm-api:test: PASS src/openmrs-fetch.test.ts (5.308 s)
+@openmrs/esm-api:test: 
+@openmrs/esm-api:test: Test Suites: 2 passed, 2 total
+@openmrs/esm-api:test: Tests:       17 passed, 17 total
+@openmrs/esm-api:test: Snapshots:   0 total
+@openmrs/esm-api:test: Time:        15.189 s
+@openmrs/esm-api:test: Ran all test suites.

package/.turbo/turbo-typescript.log

@@ -1,2 +1,2 @@
-@openmrs/esm-api:typescript: cache hit, replaying output f384980651c47452
-@openmrs/esm-api:typescript: $ tsc
+@openmrs/esm-api:typescript: cache hit, replaying output dab07e3e47e5a8d3
+@openmrs/esm-api:typescript: $ tsc

package/dist/environment.d.ts

@@ -0,0 +1 @@
+export declare function isDevEnabled(): boolean;

package/dist/fhir.d.ts

@@ -0,0 +1,18 @@
+/** @module @category API */
+import { FetchHeaders } from "./openmrs-fetch";
+import type { FhirClient } from "./types/fhir";
+export declare const fhirBaseUrl = "/ws/fhir2/R4";
+/**
+ * The `fhir` object is [an instance of fhir.js](https://github.com/FHIR/fhir.js)
+ * that can be used to call FHIR-compliant OpenMRS APIs. See
+ * [the docs for fhir.js](https://github.com/FHIR/fhir.js) for more info
+ * and example usage.
+ *
+ * @category API
+ */
+export declare const fhir: FhirClient;
+export interface FHIRRequestObj {
+    url: string;
+    method: string;
+    headers: FetchHeaders;
+}

package/dist/index.d.ts

@@ -0,0 +1,10 @@
+export * from "./types";
+export * from "./openmrs-fetch";
+export * from "./fhir";
+export * from "./setup";
+export * from "./shared-api-objects/current-user";
+export * from "./shared-api-objects/current-patient";
+export * from "./shared-api-objects/visit-utils";
+export * from "./shared-api-objects/visit-type";
+export * from "./shared-api-objects/location";
+export * from "./openmrs-backend-dependencies";

package/dist/openmrs-backend-dependencies.d.ts

@@ -0,0 +1,4 @@
+export declare const backendDependencies: {
+    "webservices.rest": string;
+    fhir2: string;
+};

package/dist/openmrs-fetch.d.ts

@@ -0,0 +1,115 @@
+/** @module @category API */
+import { Observable } from "rxjs";
+import { FetchResponse } from "./types";
+export declare const sessionEndpoint = "/ws/rest/v1/session";
+/**
+ * Append `path` to the OpenMRS SPA base.
+ *
+ * #### Example
+ *
+ * ```ts
+ * makeUrl('/foo/bar');
+ * // => '/openmrs/foo/bar'
+ * ```
+ */
+export declare function makeUrl(path: string): string;
+/**
+ * The openmrsFetch function is a wrapper around the
+ * [browser's built-in fetch function](https://developer.mozilla.org/en-US/docs/Web/API/Fetch_API/Using_Fetch),
+ * with extra handling for OpenMRS-specific API behaviors, such as
+ * request headers, authentication, authorization, and the API urls.
+ *
+ * @param path A string url to make the request to. Note that the
+ *   openmrs base url (by default `/openmrs`) will be automatically
+ *   prepended to the URL, so there is no need to include it.
+ * @param fetchInit A [fetch init object](https://developer.mozilla.org/en-US/docs/Web/API/WindowOrWorkerGlobalScope/fetch#Syntax).
+ *   Note that the `body` property does not need to be `JSON.stringify()`ed
+ *   because openmrsFetch will do that for you.
+ * @returns A [Promise](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Promise)
+ *   that resolves with a [Response object](https://developer.mozilla.org/en-US/docs/Web/API/Response).
+ *   Note that the openmrs version of the Response object has already
+ *   downloaded the HTTP response body as json, and has an additional
+ *   `data` property with the HTTP response json as a javascript object.
+ *
+ * #### Example
+ * ```js
+ * import { openmrsFetch } from '@openmrs/esm-api'
+ * const abortController = new AbortController();
+ * openmrsFetch('/ws/rest/v1/session', {signal: abortController.signal})
+ *   .then(response => {
+ *     console.log(response.data.authenticated)
+ *   })
+ *   .catch(err => {
+ *     console.error(err.status);
+ *   })
+ * abortController.abort();
+ * openmrsFetch('/ws/rest/v1/session', {
+ *   method: 'POST',
+ *   body: {
+ *     username: 'hi',
+ *     password: 'there',
+ *   }
+ * })
+ * ```
+ *
+ * #### Cancellation
+ *
+ * To cancel a network request, use an
+ * [AbortController](https://developer.mozilla.org/en-US/docs/Web/API/AbortController/abort).
+ * It is best practice to cancel your network requests when the user
+ * navigates away from a page while the request is pending request, to
+ * free up memory and network resources and to prevent race conditions.
+ *
+ * @category API
+ */
+export declare function openmrsFetch<T = any>(path: string, fetchInit?: FetchConfig): Promise<FetchResponse<T>>;
+/**
+ * The openmrsObservableFetch function is a wrapper around openmrsFetch
+ * that returns an [Observable](https://rxjs-dev.firebaseapp.com/guide/observable)
+ * instead of a promise. It exists in case using an Observable is
+ * preferred or more convenient than a promise.
+ *
+ * @param url See [[openmrsFetch]]
+ * @param fetchInit See [[openmrsFetch]]
+ * @returns An Observable that produces exactly one Response object.
+ * The response object is exactly the same as for [[openmrsFetch]].
+ *
+ * #### Example
+ *
+ * ```js
+ * import { openmrsObservableFetch } from '@openmrs/esm-api'
+ * const subscription = openmrsObservableFetch('/ws/rest/v1/session').subscribe(
+ *   response => console.log(response.data),
+ *   err => {throw err},
+ *   () => console.log('finished')
+ * )
+ * subscription.unsubscribe()
+ * ```
+ *
+ * #### Cancellation
+ *
+ * To cancel the network request, simply call `subscription.unsubscribe();`
+ *
+ * @category API
+ */
+export declare function openmrsObservableFetch<T>(url: string, fetchInit?: FetchConfig): Observable<FetchResponse<T>>;
+export declare class OpenmrsFetchError extends Error {
+    constructor(url: string, response: Response, responseBody: ResponseBody | null, requestStacktrace: Error);
+    response: Response;
+    responseBody: string | FetchResponseJson | null;
+}
+interface FetchConfig extends Omit<Omit<RequestInit, "body">, "headers"> {
+    headers?: FetchHeaders;
+    body?: FetchBody | string;
+}
+declare type ResponseBody = string | FetchResponseJson;
+export interface FetchHeaders {
+    [key: string]: string | null;
+}
+interface FetchBody {
+    [key: string]: any;
+}
+interface FetchResponseJson {
+    [key: string]: any;
+}
+export {};

package/dist/openmrs-fetch.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/public.d.ts

@@ -0,0 +1,9 @@
+export * from "./types";
+export * from "./openmrs-fetch";
+export * from "./fhir";
+export * from "./shared-api-objects/current-user";
+export * from "./shared-api-objects/current-patient";
+export * from "./shared-api-objects/visit-utils";
+export * from "./shared-api-objects/visit-type";
+export * from "./shared-api-objects/location";
+export * from "./openmrs-backend-dependencies";

package/dist/setup.d.ts

@@ -0,0 +1,4 @@
+/**
+ * @internal
+ */
+export declare function setupApiModule(): void;

package/dist/shared-api-objects/current-patient.d.ts

@@ -0,0 +1,18 @@
+/// <reference types="fhir" />
+/** @module @category API */
+import { fhir } from "../fhir";
+import { FetchResponse } from "../types";
+export declare type CurrentPatient = fhir.Patient | FetchResponse<fhir.Patient>;
+export interface CurrentPatientOptions {
+    includeConfig?: boolean;
+}
+export interface PatientWithFullResponse extends CurrentPatientOptions {
+    includeConfig: true;
+}
+export interface OnlyThePatient extends CurrentPatientOptions {
+    includeConfig: false;
+}
+export declare type PatientUuid = string | null;
+export declare function fetchCurrentPatient(patientUuid: PatientUuid, contentOverrides?: Partial<Parameters<typeof fhir.read>[0]>): Promise<null> | Promise<{
+    data: fhir.Patient;
+}>;

package/dist/shared-api-objects/current-patient.test.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/shared-api-objects/current-user.d.ts

@@ -0,0 +1,80 @@
+import { Observable } from "rxjs";
+import type { LoggedInUser, SessionLocation, Privilege, Role, Session } from "../types";
+export declare type SessionStore = LoadedSessionStore | UnloadedSessionStore;
+export declare type LoadedSessionStore = {
+    loaded: true;
+    session: Session;
+};
+export declare type UnloadedSessionStore = {
+    loaded: false;
+    session: null;
+};
+/**
+ * The getCurrentUser function returns an observable that produces
+ * **zero or more values, over time**. It will produce zero values
+ * by default if the user is not logged in. And it will provide a
+ * first value when the logged in user is fetched from the server.
+ * Subsequent values will be produced whenever the user object is
+ * updated.
+ *
+ * @param options An object with `includeAuthStatus` boolean
+ *   property that defaults to `false`. When `includeAuthStatus` is set
+ *   to `true`, the entire response object from the API will be provided.
+ *   When `includeAuthStatus` is set to `false`, only the `user` property
+ *   of the response object will be provided.
+ *
+ * @returns An Observable that produces zero or more values (as
+ *   described above). The values produced will be a user object (if
+ *   `includeAuthStatus` is set to `false`) or an object with a session
+ *   and authenticated property (if `includeAuthStatus` is set to `true`).
+ *
+ * #### Example
+ *
+ * ```js
+ * import { getCurrentUser } from '@openmrs/esm-api'
+ * const subscription = getCurrentUser().subscribe(
+ *   user => console.log(user)
+ * )
+ * subscription.unsubscribe()
+ * getCurrentUser({includeAuthStatus: true}).subscribe(
+ *   data => console.log(data.authenticated)
+ * )
+ * ```
+ *
+ * #### Be sure to unsubscribe when your component unmounts
+ *
+ * Otherwise your code will continue getting updates to the user object
+ * even after the UI component is gone from the screen. This is a memory
+ * leak and source of bugs.
+ */
+declare function getCurrentUser(): Observable<Session>;
+declare function getCurrentUser(opts: {
+    includeAuthStatus: true;
+}): Observable<Session>;
+declare function getCurrentUser(opts: {
+    includeAuthStatus: false;
+}): Observable<LoggedInUser>;
+export { getCurrentUser };
+export declare function getSessionStore(): import("unistore").Store<SessionStore>;
+/**
+ * The `refetchCurrentUser` function causes a network request to redownload
+ * the user. All subscribers to the current user will be notified of the
+ * new users once the new version of the user object is downloaded.
+ *
+ * @returns The same observable as returned by [[getCurrentUser]].
+ *
+ * #### Example
+ * ```js
+ * import { refetchCurrentUser } from '@openmrs/esm-api'
+ * refetchCurrentUser()
+ * ```
+ */
+export declare function refetchCurrentUser(): Promise<unknown>;
+export declare function clearCurrentUser(): void;
+export declare function userHasAccess(requiredPrivilege: string, user: {
+    privileges: Array<Privilege>;
+    roles: Array<Role>;
+}): Privilege | undefined;
+export declare function getLoggedInUser(): Promise<LoggedInUser>;
+export declare function getSessionLocation(): Promise<SessionLocation | undefined>;
+export declare function setSessionLocation(locationUuid: string, abortController: AbortController): Promise<any>;

package/dist/shared-api-objects/location.d.ts

@@ -0,0 +1,5 @@
+/** @module @category API */
+import { Observable } from "rxjs";
+import { Location } from "../types";
+export declare function toLocationObject(openmrsRestForm: any): Location;
+export declare function getLocations(): Observable<Array<Location>>;

package/dist/shared-api-objects/visit-type.d.ts

@@ -0,0 +1,5 @@
+/** @module @category API */
+import { Observable } from "rxjs";
+import { VisitType } from "../types";
+export declare function toVisitTypeObject(openmrsRestForm: any): VisitType;
+export declare function getVisitTypes(): Observable<Array<VisitType>>;

package/dist/shared-api-objects/visit-utils.d.ts

@@ -0,0 +1,25 @@
+/** @module @category API */
+import { Observable, BehaviorSubject } from "rxjs";
+import { FetchResponse, NewVisitPayload, UpdateVisitPayload, Visit } from "../types";
+export declare const defaultVisitCustomRepresentation: string;
+export declare function getVisitsForPatient(patientUuid: string, abortController: AbortController, v?: string): Observable<FetchResponse<{
+    results: Array<Visit>;
+}>>;
+export declare function saveVisit(payload: NewVisitPayload, abortController: AbortController): Observable<FetchResponse<any>>;
+export declare function updateVisit(uuid: string, payload: UpdateVisitPayload, abortController: AbortController): Observable<any>;
+export declare const getStartedVisit: BehaviorSubject<VisitItem | null>;
+export interface VisitItem {
+    mode: VisitMode;
+    visitData?: Visit;
+    status: VisitStatus;
+    anythingElse?: any;
+}
+export declare enum VisitMode {
+    NEWVISIT = "startVisit",
+    EDITVISIT = "editVisit",
+    LOADING = "loadingVisit"
+}
+export declare enum VisitStatus {
+    NOTSTARTED = "notStarted",
+    ONGOING = "ongoing"
+}

package/dist/types/fetch.d.ts

@@ -0,0 +1,7 @@
+import { Session } from "./user-resource";
+export interface FetchResponse<T = any> extends Response {
+    data: T;
+}
+export interface LoggedInUserFetchResponse extends FetchResponse {
+    data: Session;
+}

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

@@ -0,0 +1,40 @@
+export interface FHIRResource {
+    resource: {
+        code: {
+            coding: Array<FHIRCode>;
+        };
+        effectiveDateTime: Date;
+        encounter: {
+            reference: string;
+            type: string;
+        };
+        id: string;
+        issued: Date;
+        referenceRange: any;
+        resourceType: string;
+        status: string;
+        subject: {
+            display: string;
+            identifier: {
+                id: string;
+                system: string;
+                use: string;
+                value: string;
+            };
+            reference: string;
+            type: string;
+        };
+        valueQuantity: {
+            value: number;
+        };
+        valueString: string;
+        valueCodeableConcept: {
+            coding: Array<FHIRCode>;
+        };
+    };
+}
+export interface FHIRCode {
+    code: string;
+    system: string;
+    display?: string;
+}

package/dist/types/fhir.d.ts

@@ -0,0 +1,88 @@
+/// <reference types="fhir" />
+/// <reference types="node" />
+import { FetchHeaders } from "../openmrs-fetch";
+declare type ClientFn = (...args: any[]) => Promise<{
+    data: any;
+}>;
+declare type ResourceName = "DomainResource" | "Organization" | "Location" | "HealthcareService" | "Practitioner" | "Patient" | "RelatedPerson" | "Device" | "Account" | "AllergyIntolerance" | "Schedule" | "Slot" | "Appointment" | "AppointmentResponse" | "AuditEvent" | "Basic" | "BodySite" | "Substance" | "Medication" | "Group" | "Specimen" | "DeviceComponent" | "DeviceMetric" | "ValueSet" | "Questionnaire" | "QuestionnaireResponse" | "Observation" | "FamilyMemberHistory" | "DocumentReference" | "DiagnosticOrder" | "ProcedureRequest" | "ReferralRequest" | "Procedure" | "ImagingStudy" | "ImagingObjectSelection" | "Media" | "DiagnosticReport" | "CommunicationRequest" | "DeviceUseRequest" | "MedicationOrder" | "NutritionOrder" | "Order" | "ProcessRequest" | "SupplyRequest" | "VisionPrescription" | "ClinicalImpression" | "Condition" | "EpisodeOfCare" | "Encounter" | "MedicationStatement" | "RiskAssessment" | "Goal" | "CarePlan" | "Composition" | "Contract" | "Coverage" | "ClaimResponse" | "Claim" | "Communication" | "StructureDefinition" | "ConceptMap" | "OperationDefinition" | "Conformance" | "DataElement" | "DetectedIssue" | "DeviceUseStatement" | "DocumentManifest" | "EligibilityRequest" | "EligibilityResponse" | "EnrollmentRequest" | "EnrollmentResponse" | "ExplanationOfBenefit" | "Flag" | "Immunization" | "ImmunizationRecommendation" | "ImplementationGuide" | "List" | "MedicationAdministration" | "MedicationDispense" | "OperationOutcome" | "MessageHeader" | "NamingSystem" | "OrderResponse" | "PaymentNotice" | "PaymentReconciliation" | "Person" | "ProcessResponse" | "Provenance" | "SearchParameter" | "Subscription" | "SupplyDelivery" | "TestScript" | "Binary" | "Bundle" | "Parameters";
+interface QueryOptions {
+    $include?: {
+        [key: string]: string | string[];
+    };
+    [key: string]: any;
+}
+declare function Create<T extends fhir.DomainResource>(content: {
+    resource: T;
+}): Promise<{
+    data: T;
+}>;
+declare function Create(content: {
+    type: "Binary";
+    data: Buffer;
+}): Promise<{
+    data: fhir.Binary;
+}>;
+declare function Create<T extends fhir.DomainResource>(content: {
+    type: ResourceName;
+    data: T;
+}): Promise<{
+    data: T;
+}>;
+declare function Read<T extends fhir.DomainResource>(content: {
+    type: ResourceName;
+    id?: string;
+    patient?: string;
+    headers?: FetchHeaders;
+}): Promise<{
+    data: T;
+}>;
+declare function Patch(content: {
+    type: ResourceName;
+    id: string;
+    data: Array<{
+        op: "replace" | "add" | "remove";
+        path: string;
+        value: string | object;
+    }>;
+}): Promise<{
+    data: fhir.OperationOutcome;
+}>;
+declare function Update<T extends fhir.DomainResource>(content: {
+    resource: T;
+}): Promise<{
+    data: T;
+}>;
+declare function Search(content: {
+    type: ResourceName;
+    count?: number;
+    query?: QueryOptions;
+}): Promise<{
+    data: fhir.Bundle;
+}>;
+declare function NextPage(content: {
+    type: ResourceName;
+    bundle: fhir.Bundle;
+}): Promise<{
+    data: fhir.Bundle;
+}>;
+export interface FhirClient {
+    conformance: ClientFn;
+    document: ClientFn;
+    profile: ClientFn;
+    transaction: ClientFn;
+    history: ClientFn;
+    typeHistory: ClientFn;
+    resourceHistory: ClientFn;
+    read: typeof Read;
+    vread: ClientFn;
+    delete: ClientFn;
+    create: typeof Create;
+    validate: ClientFn;
+    search: typeof Search;
+    update: typeof Update;
+    nextPage: typeof NextPage;
+    prevPage: ClientFn;
+    resolve: ClientFn;
+    patch: typeof Patch;
+}
+export {};

package/dist/types/index.d.ts

@@ -0,0 +1,5 @@
+export * from "./fetch";
+export * from "./fhir-resource";
+export * from "./openmrs-resource";
+export * from "./user-resource";
+export * from "./visit-resource";

package/dist/types/openmrs-resource.d.ts

@@ -0,0 +1,5 @@
+export interface OpenmrsResource {
+    uuid: string;
+    display?: string;
+    [anythingElse: string]: any;
+}

package/dist/types/user-resource.d.ts

@@ -0,0 +1,48 @@
+export interface Session {
+    allowedLocales?: Array<string>;
+    authenticated: boolean;
+    locale?: string;
+    sessionId: string;
+    user?: LoggedInUser;
+    currentProvider?: {
+        uuid: string;
+        identifier: string;
+    };
+    sessionLocation?: SessionLocation;
+}
+export interface LoggedInUser {
+    uuid: string;
+    display: string;
+    username: string;
+    systemId: string;
+    userProperties: {
+        [key: string]: any;
+    } | null;
+    person: Person;
+    privileges: Array<Privilege>;
+    roles: Array<Role>;
+    retired: boolean;
+    locale: string;
+    allowedLocales: Array<string>;
+    [anythingElse: string]: any;
+}
+export interface SessionLocation {
+    uuid: string;
+    display: string;
+    links: Array<any>;
+}
+export interface Person {
+    uuid: string;
+    display: string;
+    links: Array<any>;
+}
+export interface Privilege {
+    uuid: string;
+    display: string;
+    links?: Array<any>;
+}
+export interface Role {
+    uuid: string;
+    display: string;
+    links: Array<any>;
+}

package/dist/types/visit-resource.d.ts

@@ -0,0 +1,32 @@
+import { OpenmrsResource } from "./openmrs-resource";
+export interface NewVisitPayload {
+    uuid?: string;
+    location: string;
+    patient?: string;
+    startDatetime: Date;
+    visitType: string;
+    stopDatetime?: Date;
+}
+export declare type UpdateVisitPayload = NewVisitPayload & {};
+export interface Visit {
+    uuid: string;
+    display?: string;
+    encounters: Array<OpenmrsResource>;
+    patient?: OpenmrsResource;
+    visitType: VisitType;
+    location?: Location;
+    startDatetime: string;
+    stopDatetime?: string;
+    attributes?: Array<OpenmrsResource>;
+    [anythingElse: string]: any;
+}
+export interface Location {
+    uuid: string;
+    display?: string;
+    name?: string;
+}
+export interface VisitType {
+    uuid: string;
+    display: string;
+    name?: string;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-api",
-  "version": "4.0.0-pre.0",
+  "version": "4.0.0-pre.1",
   "license": "MPL-2.0",
   "description": "The javascript module for interacting with the OpenMRS API",
   "browser": "dist/openmrs-esm-api.js",
@@ -44,11 +44,11 @@
     "@openmrs/esm-error-handling": "4.x"
   },
   "devDependencies": {
-    "@openmrs/esm-config": "^4.0.0-pre.0",
-    "@openmrs/esm-error-handling": "^4.0.0-pre.0",
-    "@openmrs/esm-state": "^4.0.0-pre.0",
+    "@openmrs/esm-config": "^4.0.0-pre.1",
+    "@openmrs/esm-error-handling": "^4.0.0-pre.1",
+    "@openmrs/esm-state": "^4.0.0-pre.1",
     "@types/fhir": "0.0.31",
     "rxjs": "^6.5.3"
   },
-  "gitHead": "254a7226212aac82df4434639b2584e24ac240e4"
+  "gitHead": "9f58b801f07526083a9edc1cc5a1e58660d71eb0"
 }

package/src/types/fhir-resource.ts

@@ -20,10 +20,13 @@ export interface FHIRResource {
     valueQuantity: {
       value: number;
     };
+    valueString: string;
+    valueCodeableConcept: { coding: Array<FHIRCode> };
   };
 }
 
 export interface FHIRCode {
   code: string;
   system: string;
+  display?: string;
 }