@openmrs/esm-api 6.2.1-pre.2777 → 6.2.1-pre.2779

package/.turbo/turbo-build.log

@@ -2,7 +2,7 @@ Browserslist: caniuse-lite is outdated. Please run:
   npx update-browserslist-db@latest
   Why you should do it regularly: https://github.com/browserslist/update-db#readme
 asset openmrs-esm-api.js 55.3 KiB [emitted] [minimized] (name: main) 2 related assets
-orphan modules 1.02 MiB [orphan] 869 modules
+orphan modules 1.02 MiB [orphan] 872 modules
 runtime modules 670 bytes 3 modules
 built modules 144 KiB [built]
   modules by path external "@openmrs/ 168 bytes
@@ -13,4 +13,4 @@ built modules 144 KiB [built]
   cacheable modules 144 KiB
     ./src/index.ts + 51 modules 136 KiB [built] [code generated]
     ../esm-state/dist/openmrs-esm-state.js 8.12 KiB [built] [code generated]
-webpack 5.88.0 compiled successfully in 4622 ms
+webpack 5.88.0 compiled successfully in 4563 ms

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@openmrs/esm-api",
-  "version": "6.2.1-pre.2777",
+  "version": "6.2.1-pre.2779",
   "license": "MPL-2.0",
   "description": "The javascript module for interacting with the OpenMRS API",
   "browser": "dist/openmrs-esm-api.js",
@@ -48,10 +48,10 @@
     "@openmrs/esm-offline": "6.x"
   },
   "devDependencies": {
-    "@openmrs/esm-config": "6.2.1-pre.2777",
-    "@openmrs/esm-error-handling": "6.2.1-pre.2777",
-    "@openmrs/esm-navigation": "6.2.1-pre.2777",
-    "@openmrs/esm-state": "6.2.1-pre.2777",
+    "@openmrs/esm-config": "6.2.1-pre.2779",
+    "@openmrs/esm-error-handling": "6.2.1-pre.2779",
+    "@openmrs/esm-navigation": "6.2.1-pre.2779",
+    "@openmrs/esm-state": "6.2.1-pre.2779",
     "rxjs": "^6.5.3",
     "webpack": "^5.88.0"
   },

package/src/types/concept-resource.ts

@@ -1,5 +1,14 @@
-import { type OpenmrsResource } from './openmrs-resource';
+import { type OpenmrsResourceStrict, type OpenmrsResource } from './openmrs-resource';
 
-export interface Concept extends OpenmrsResource {
-  // TODO: add more fields
+export interface Concept extends OpenmrsResourceStrict {
+  name?: string;
+  locale?: string;
+  localPreferred?: boolean;
+  conceptNameType?: 'FULLY_SPECIFIED' | 'SHORT' | 'INDEX_TERM';
+}
+
+export interface ConceptClass extends OpenmrsResourceStrict {
+  name?: string;
+  description?: string;
+  retired?: boolean;
 }

package/src/types/diagnosis-resource.ts

@@ -0,0 +1,23 @@
+import { type Concept, type ConceptClass } from './concept-resource';
+import { type Encounter } from './encounter-resource';
+import { type OpenmrsResource, type OpenmrsResourceStrict } from './openmrs-resource';
+import { type Patient } from './patient-resource';
+
+export interface Diagnosis extends OpenmrsResourceStrict {
+  diagnosis?: {
+    coded?: {
+      uuid: string;
+      display?: string;
+      name: Concept;
+      datatype: OpenmrsResource;
+      conceptClass: ConceptClass;
+    };
+    nonCoded?: string;
+  };
+  patient?: Patient;
+  encounter?: Encounter;
+  certainty?: string;
+  rank?: number;
+  formFieldNamespace?: string;
+  formFieldPath?: string;
+}

package/src/types/encounter-resource.ts

@@ -0,0 +1,34 @@
+import { type OpenmrsResource, type OpenmrsResourceStrict } from './openmrs-resource';
+import { type Patient } from './patient-resource';
+import { type Location } from './location-resource';
+import { type Visit } from './visit-resource';
+import { type Diagnosis } from './diagnosis-resource';
+import { type Obs } from './obs-resource';
+
+export interface Encounter extends OpenmrsResourceStrict {
+  encounterDateTime?: string;
+  patient?: Patient;
+  location?: Location;
+  encounterType?: EncounterType;
+  obs?: Array<Obs>;
+  visit?: Visit;
+  encounterProviders?: Array<OpenmrsResource>;
+  diagnoses?: Array<Diagnosis>;
+}
+
+export interface EncounterType extends OpenmrsResourceStrict {
+  name: string;
+  description: string;
+  retired: boolean;
+}
+
+export interface EncounterProvider extends OpenmrsResourceStrict {
+  provider: OpenmrsResource;
+  encounterRole: EncounterRole;
+}
+
+export interface EncounterRole extends OpenmrsResourceStrict {
+  name: string;
+  description: string;
+  retired: boolean;
+}

package/src/types/index.ts

@@ -1,7 +1,10 @@
 export * from './attachments-types';
 export * from './concept-resource';
+export * from './diagnosis-resource';
+export * from './encounter-resource';
 export * from './fetch';
 export * from './fhir-resource';
+export * from './obs-resource';
 export * from './openmrs-resource';
 export * from './user-resource';
 export * from './patient-resource';

package/src/types/location-resource.ts

@@ -1,3 +1,37 @@
+import { type OpenmrsResource, type OpenmrsResourceStrict } from './openmrs-resource';
+
+export interface Location extends OpenmrsResourceStrict {
+  name?: string;
+  description?: string;
+  cityVillage?: string;
+  stateProvince?: string;
+  country?: string;
+  postalCode?: string;
+  countyDistrict?: string;
+  latitude?: string;
+  longitude?: string;
+  address1?: string;
+  address2?: string;
+  address3?: string;
+  address4?: string;
+  address5?: string;
+  address6?: string;
+  address7?: string;
+  address8?: string;
+  address9?: string;
+  address10?: string;
+  address11?: string;
+  address12?: string;
+  address13?: string;
+  address14?: string;
+  address15?: string;
+  tags?: Array<OpenmrsResource>;
+  attributes?: Array<OpenmrsResource>;
+  parentLocation?: Location;
+  childLocation?: Location;
+  retired?: boolean;
+}
+
 export interface FHIRLocationResource {
   resource: {
     id: string;

package/src/types/obs-resource.ts

@@ -0,0 +1,25 @@
+import { type Concept } from './concept-resource';
+import { type Encounter } from './encounter-resource';
+import { type Location } from './location-resource';
+import { type OpenmrsResource, type OpenmrsResourceStrict } from './openmrs-resource';
+import { type Person } from './person-resource';
+
+export interface Obs extends OpenmrsResourceStrict {
+  concept?: Concept;
+  person?: Person;
+  obsDatetime?: string;
+  accessionNumber?: string;
+  obsGroup?: Obs;
+  valueCodedName?: OpenmrsResource;
+  groupMembers?: Array<Obs>;
+  comment?: string;
+  location?: Location;
+  order?: OpenmrsResource;
+  encounter?: Encounter;
+  value?: number | string | boolean | OpenmrsResource;
+  valueModifier?: string;
+  formFilePath?: string;
+  formFiledNamespace?: string;
+  status?: 'PRELIMINARY' | 'FINAL' | 'AMENDED';
+  interpretation?: string;
+}

package/src/types/visit-resource.ts

@@ -1,4 +1,6 @@
+import { type Encounter } from './encounter-resource';
 import type { OpenmrsResource } from './openmrs-resource';
+import { type Patient } from './patient-resource';
 
 export interface NewVisitPayload {
   uuid?: string;
@@ -18,8 +20,8 @@ export type UpdateVisitPayload = Partial<NewVisitPayload> & {};
 export interface Visit {
   uuid: string;
   display?: string;
-  encounters: Array<OpenmrsResource>;
-  patient?: OpenmrsResource;
+  encounters?: Array<Encounter>;
+  patient?: Patient;
   visitType: VisitType;
   location?: Location;
   startDatetime: string;