@smile-cdr/fhirts 2.3.0 → 2.4.1

package/eslint.config.mjs

@@ -0,0 +1,69 @@
+import eslint from '@eslint/js';
+import tseslint from '@typescript-eslint/eslint-plugin';
+import tsparser from '@typescript-eslint/parser';
+import prettier from 'eslint-plugin-prettier';
+
+export default [
+  eslint.configs.recommended,
+  {
+    files: ['src/**/*.ts'],
+    languageOptions: {
+      parser: tsparser,
+      parserOptions: {
+        ecmaVersion: 2020,
+        sourceType: 'module',
+        project: './tsconfig.json',
+      },
+    },
+    plugins: {
+      '@typescript-eslint': tseslint,
+      prettier: prettier,
+    },
+    rules: {
+      // Prettier integration
+      'prettier/prettier': 'error',
+
+      // TypeScript specific rules
+      '@typescript-eslint/no-explicit-any': 'off', // Allow any for now (library uses it extensively)
+      '@typescript-eslint/explicit-module-boundary-types': 'off',
+      '@typescript-eslint/no-unused-vars': ['warn', {
+        argsIgnorePattern: '^_',
+        varsIgnorePattern: '^_',
+      }],
+
+      // General rules
+      'no-console': 'warn',
+      'no-debugger': 'error',
+      'prefer-const': 'error',
+      'no-var': 'error',
+      'eqeqeq': ['error', 'always'],
+      'curly': ['error', 'all'],
+      'no-throw-literal': 'error',
+
+      // Disable rules that conflict with TypeScript
+      'no-undef': 'off',
+      'no-unused-vars': 'off',
+    },
+  },
+  {
+    files: ['**/*.spec.ts', '**/*.test.ts'],
+    rules: {
+      '@typescript-eslint/no-unused-vars': 'off',
+      'no-console': 'off',
+    },
+  },
+  {
+    ignores: [
+      'dist/**',
+      'node_modules/**',
+      'coverage/**',
+      '*.js',
+      '*.mjs',
+      'src/FHIR-R4/classes/**',
+      'src/FHIR-R4/interfaces/**',
+      'src/FHIR-R5/**',
+      'src/FHIR-R3.ts',
+      'src/FHIR-DSTU2.ts',
+    ],
+  },
+];

package/package.json

@@ -1,24 +1,38 @@
 {
   "name": "@smile-cdr/fhirts",
-  "version": "2.3.0",
-  "description": "Fhir ts/js library for frontend apps",
+  "version": "2.4.1",
+  "description": "Fhir ts/js library for frontend applications with FHIR types and useful utilities.",
   "license": "Apache-2.0",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
-  "repository": "git://github.com/smilecdr/FHIR.ts",
+  "repository": {
+    "type": "git",
+    "url": "git://github.com/smilecdr/FHIR.ts.git"
+  },
   "scripts": {
     "build": "tsc",
-    "test": "ts-node --project ./tsconfig.json node_modules/jasmine/bin/jasmine --config=spec/support/jasmine.json",
+    "test": "tsx --tsconfig ./tsconfig.json node_modules/jasmine/bin/jasmine --config=spec/support/jasmine.json",
     "coverage": "nyc npm run test",
-    "audit": "better-npm-audit audit"
+    "audit": "better-npm-audit audit",
+    "lint": "eslint \"src/library/**/*.ts\" \"src/index.ts\"",
+    "lint:fix": "eslint \"src/library/**/*.ts\" \"src/index.ts\" --fix",
+    "format": "prettier --write \"src/**/*.ts\"",
+    "format:check": "prettier --check \"src/**/*.ts\""
   },
   "devDependencies": {
     "@types/jasmine": "^4.3.1",
-    "@types/node": "^20.12.12",
+    "@types/node": "^25.2.3",
+    "@typescript-eslint/eslint-plugin": "^8.55.0",
+    "@typescript-eslint/parser": "^8.55.0",
     "better-npm-audit": "^3.7.3",
+    "eslint": "^9.39.2",
+    "eslint-config-prettier": "^10.1.8",
+    "eslint-plugin-prettier": "^5.5.5",
     "jasmine": "^4.5.0",
     "nyc": "^15.1.0",
+    "prettier": "^3.8.1",
     "ts-node": "^10.9.1",
-    "typescript": "^4.0.2"
+    "tsx": "^4.21.0",
+    "typescript": "^5.9.3"
   }
 }

package/src/FHIR-DSTU2.ts

@@ -14,7 +14,7 @@ export class Id {
   constructor(input?: string) {
     const re = new RegExp('[A-Za-z0-9\\-\\.]{1,64}');
 
-    if (re.test(input)) {
+    if (input && re.test(input)) {
       this.id = input;
     } else {
       throw new RangeError('Not a valid Id string - must match reg exp [A-Za-z0-9\\-\\.]{1,64} Was provided: ' + input);

package/src/FHIR-R3.ts

@@ -35,7 +35,9 @@ export class Code extends FHIRElement {
 
   constructor(input?: string) {
     super();
-    this.setCode(input);
+    if (input) {
+      this.setCode(input);
+    }
   }
 
   private setCode(input: string) {

package/src/FHIR-R4/classes/resource.ts

@@ -91,6 +91,7 @@ import { OperationDefinition } from './operationDefinition';
 import { OperationOutcome } from './operationOutcome';
 import { Organization } from './organization';
 import { OrganizationAffiliation } from './organizationAffiliation';
+import { Parameters } from './parameters';
 import { Patient } from './patient';
 import { PaymentNotice } from './paymentNotice';
 import { PaymentReconciliation } from './paymentReconciliation';
@@ -129,4 +130,4 @@ import { ValueSet } from './valueSet';
 import { VerificationResult } from './verificationResult';
 import { VisionPrescription } from './visionPrescription';
 
-export type Resource = Account | ActivityDefinition | AdverseEvent | AllergyIntolerance | Appointment | AppointmentResponse | AuditEvent | Binary | BiologicallyDerivedProduct | BodyStructure | Bundle | CapabilityStatement | CarePlan | CareTeam | CatalogEntry | ChargeItem | ChargeItemDefinition | Claim | ClaimResponse | ClinicalImpression | CodeSystem | Communication | CommunicationRequest | CompartmentDefinition | Composition | ConceptMap | Condition | Consent | Contract | Coverage | CoverageEligibilityRequest | CoverageEligibilityResponse | DetectedIssue | Device | DeviceDefinition | DeviceMetric | DeviceRequest | DeviceUseStatement | DiagnosticReport | DocumentManifest | DocumentReference | Encounter | Endpoint | EnrollmentRequest | EnrollmentResponse | EpisodeOfCare | EventDefinition | Evidence | EvidenceVariable | ExampleScenario | ExplanationOfBenefit | FamilyMemberHistory | Flag | Goal | GraphDefinition | Group | GuidanceResponse | HealthcareService | ImagingStudy | Immunization | ImmunizationEvaluation | ImmunizationRecommendation | ImplementationGuide | InsurancePlan | Invoice | Library | Linkage | List | Location | Measure | MeasureReport | Media | Medication | MedicationAdministration | MedicationDispense | MedicationKnowledge | MedicationRequest | MedicationStatement | MessageDefinition | MessageHeader | MolecularSequence | NamingSystem | NutritionOrder | Observation | ObservationDefinition | OperationDefinition | OperationOutcome | Organization | OrganizationAffiliation | Patient | PaymentNotice | PaymentReconciliation | Person | PlanDefinition | Practitioner | PractitionerRole | Procedure | Provenance | Questionnaire | QuestionnaireResponse | RelatedPerson | RequestGroup | ResearchDefinition | ResearchElementDefinition | ResearchStudy | ResearchSubject | RiskAssessment | Schedule | SearchParameter | ServiceRequest | Slot | Specimen | SpecimenDefinition | StructureDefinition | StructureMap | Subscription | Substance | SupplyDelivery | SupplyRequest | Task | TerminologyCapabilities | TestReport | TestScript | ValueSet | VerificationResult | VisionPrescription;
+export type Resource = Account | ActivityDefinition | AdverseEvent | AllergyIntolerance | Appointment | AppointmentResponse | AuditEvent | Basic | Binary | BiologicallyDerivedProduct | BodyStructure | Bundle | CapabilityStatement | CarePlan | CareTeam | CatalogEntry | ChargeItem | ChargeItemDefinition | Claim | ClaimResponse | ClinicalImpression | CodeSystem | Communication | CommunicationRequest | CompartmentDefinition | Composition | ConceptMap | Condition | Consent | Contract | Coverage | CoverageEligibilityRequest | CoverageEligibilityResponse | DetectedIssue | Device | DeviceDefinition | DeviceMetric | DeviceRequest | DeviceUseStatement | DiagnosticReport | DocumentManifest | DocumentReference | Encounter | Endpoint | EnrollmentRequest | EnrollmentResponse | EpisodeOfCare | EventDefinition | Evidence | EvidenceVariable | ExampleScenario | ExplanationOfBenefit | FamilyMemberHistory | Flag | Goal | GraphDefinition | Group | GuidanceResponse | HealthcareService | ImagingStudy | Immunization | ImmunizationEvaluation | ImmunizationRecommendation | ImplementationGuide | InsurancePlan | Invoice | Library | Linkage | List | Location | Measure | MeasureReport | Media | Medication | MedicationAdministration | MedicationDispense | MedicationKnowledge | MedicationRequest | MedicationStatement | MessageDefinition | MessageHeader | MolecularSequence | NamingSystem | NutritionOrder | Observation | ObservationDefinition | OperationDefinition | OperationOutcome | Organization | OrganizationAffiliation | Parameters | Patient | PaymentNotice | PaymentReconciliation | Person | PlanDefinition | Practitioner | PractitionerRole | Procedure | Provenance | Questionnaire | QuestionnaireResponse | RelatedPerson | RequestGroup | ResearchDefinition | ResearchElementDefinition | ResearchStudy | ResearchSubject | RiskAssessment | Schedule | SearchParameter | ServiceRequest | Slot | Specimen | SpecimenDefinition | StructureDefinition | StructureMap | Subscription | Substance | SupplyDelivery | SupplyRequest | Task | TerminologyCapabilities | TestReport | TestScript | ValueSet | VerificationResult | VisionPrescription;

package/src/index.ts

@@ -8,4 +8,15 @@ import { BundleUtils } from './library/BundleUtils/BundleUtils';
 import { QueryBuilder } from './library/QueryBuilder/QueryBuilder';
 import { PatchUtils } from './library/PatchUtils/PatchUtils';
 import * as fhirtsConstants from './library/constants';
-export { fhirR5, fhirR4, fhirR3, IfhirR4, dstu2, ResourceUtils, BundleUtils, QueryBuilder, PatchUtils, fhirtsConstants};
+export {
+  fhirR5,
+  fhirR4,
+  fhirR3,
+  IfhirR4,
+  dstu2,
+  ResourceUtils,
+  BundleUtils,
+  QueryBuilder,
+  PatchUtils,
+  fhirtsConstants,
+};

package/src/library/BundleUtils/BundleUtils.spec.ts

@@ -1,94 +1,81 @@
-import { BundleUtils } from "./BundleUtils";
+import { BundleUtils } from './BundleUtils';
 
-const inputPayload = require("./../../test-resources/Bundle-R4.json");
-describe("BundleUtils", () => {
+const inputPayload = require('./../../test-resources/Bundle-R4.json');
+describe('BundleUtils', () => {
+  const bundleUtils = new BundleUtils();
 
-  let bundleUtils = new BundleUtils();
-  
-  describe("#getResources()", () => {
-    it("should return empty array if null is passed as bundle entries", () => {
+  describe('#getResources()', () => {
+    it('should return empty array if null is passed as bundle entries', () => {
       // execute
-      const actual = bundleUtils.getResources(null, "Patient");
+      const actual = bundleUtils.getResources(null, 'Patient');
       // validate
       expect(actual.length).toEqual(0);
     });
 
-    it("should return empty array if invalid resourceType is passed", () => {
+    it('should return empty array if invalid resourceType is passed', () => {
       // execute
-      const actual = bundleUtils.getResources(
-        inputPayload.entry,
-        "patient"
-      );
+      const actual = bundleUtils.getResources(inputPayload.entry, 'patient');
       // validate
       expect(actual.length).toEqual(0);
     });
 
-    it("should return all matches array", () => {
+    it('should return all matches array', () => {
       // execute
-      const actual = bundleUtils.getResources(
-        inputPayload.entry,
-        "Claim"
-      );
+      const actual = bundleUtils.getResources(inputPayload.entry, 'Claim');
       // validate
       expect(actual.length).toEqual(27);
     });
   });
 
-  describe("#getResource()", () => {
-    it("should return null if null is passed as bundle entries", () => {
+  describe('#getResource()', () => {
+    it('should return null if null is passed as bundle entries', () => {
       // execute
-      const actual = bundleUtils.getResource(null, "123");
+      const actual = bundleUtils.getResource(null, '123');
       // validate
       expect(actual).toBeNull();
     });
 
-    it("should return undefined if resourceId is not found", () => {
+    it('should return undefined if resourceId is not found', () => {
       // execute
-      const actual = bundleUtils.getResource(
-        inputPayload.entry,
-        "123"
-      );
+      const actual = bundleUtils.getResource(inputPayload.entry, '123');
       // validate
       expect(actual).toBeUndefined();
     });
 
-    it("should return resource if resource is found", () => {
+    it('should return resource if resource is found', () => {
       // execute
       const actual = bundleUtils.getResource(
         inputPayload.entry,
-        "ec0bb1b3-b229-36cf-7e34-3f5fec9d3afe"
+        'ec0bb1b3-b229-36cf-7e34-3f5fec9d3afe'
       );
       // validate
       expect(actual).not.toBeUndefined();
     });
   });
 
-  describe("#getResourceByFullUrl()", () => {
-    it("should return null if null is passed as bundle entries", () => {
+  describe('#getResourceByFullUrl()', () => {
+    it('should return null if null is passed as bundle entries', () => {
       // execute
-      const actual = bundleUtils.getResourceByFullUrl(null, "123");
+      const actual = bundleUtils.getResourceByFullUrl(null, '123');
       // validate
       expect(actual).toBeNull();
     });
 
-    it("should return undefined if fullUrl is not found", () => {
+    it('should return undefined if fullUrl is not found', () => {
       // execute
-      const actual = bundleUtils.getResourceByFullUrl(
-        inputPayload.entry,
-        "123"
-      );
+      const actual = bundleUtils.getResourceByFullUrl(inputPayload.entry, '123');
       // validate
       expect(actual).toBeUndefined();
     });
 
-    it("should return resource if resource is found", () => {
+    it('should return resource if resource is found', () => {
       // execute
       const actual = bundleUtils.getResourceByFullUrl(
         inputPayload.entry,
-        "urn:uuid:7c52dd91-73f8-83e1-cab2-2ffdd7a34601"
+        'urn:uuid:7c52dd91-73f8-83e1-cab2-2ffdd7a34601'
       );
       // validate
       expect(actual).not.toBeUndefined();
     });
-  })
+  });
 });

package/src/library/BundleUtils/BundleUtils.ts

@@ -1,35 +1,49 @@
 export class BundleUtils {
+  /**
+   * Get resources from bundle entries filtered by resource type
+   *
+   * @template T - The resource type to return (defaults to any for backward compatibility)
+   * @param bundleEntry Bundle.entry[] i.e. the bundle entries to filter
+   * @param resourceTypeToFilter ResourceType to filter from bundle entries
+   * @returns array of resources
+   */
+  getResources<T = any>(bundleEntry: any[] | null, resourceTypeToFilter: string): T[] {
+    return bundleEntry?.length
+      ? bundleEntry
+          .filter((x) => x['resource']['resourceType'] === resourceTypeToFilter)
+          .map((x) => x['resource'])
+      : [];
+  }
 
-    /**
-     * 
-     * @param bundleEntry Bundle.entry[] i.e. the bundle entries to filter
-     * @param resourceTypeToFilter ResourceType to filter from bundle entries
-     * @returns array of resources
-     */
-    getResources(bundleEntry: any[], resourceTypeToFilter: string): any[] {
-        return bundleEntry?.length ? bundleEntry.filter(x => x['resource']['resourceType'] === resourceTypeToFilter) : [];
+  /**
+   * Get a single resource from bundle entries by resource ID
+   *
+   * @template T - The resource type to return (defaults to any for backward compatibility)
+   * @param bundleEntry Bundle.entry[] i.e. the bundle entries to filter
+   * @param resourceId Resource ID to filter from bundle entries
+   * @returns single resource, undefined if not found, or null if input is null
+   */
+  getResource<T = any>(bundleEntry: any[] | null, resourceId: string): T | null {
+    if (!bundleEntry) {
+      return null;
     }
+    const entry = bundleEntry.find((x) => x['resource']?.['id'] === resourceId);
+    return entry?.['resource'];
+  }
 
-    /**
-     * 
-     * @param bundleEntry Bundle.entry[] i.e. the bundle entries to filter
-     * @param resourceId Resource ID to filter from bundle entries
-     * @returns single resource
-     */
-    getResource(bundleEntry: any[], resourceId: string): any {
-        return bundleEntry?.length ? bundleEntry.find(x => x['resource']['id'] === resourceId) : null;
-    }
-
-    /**
-     *
-     * @param bundleEntry Bundle.entry[] i.e. the bundle entries to filter
-     * @param fullUrl Full Url to filter from bundle entries
-     * @returns single resource
-     */
-    getResourceByFullUrl(bundleEntry: any[], fullUrl: string): any {
-        return bundleEntry?.length ? bundleEntry.find(x => x['fullUrl'] === fullUrl) : null;
+  /**
+   * Get a single resource from bundle entries by full URL
+   *
+   * @template T - The resource type to return (defaults to any for backward compatibility)
+   * @param bundleEntry Bundle.entry[] i.e. the bundle entries to filter
+   * @param fullUrl Full Url to filter from bundle entries
+   * @returns single resource if not found, or null if input is null
+   */
+  getResourceByFullUrl<T = any>(bundleEntry: any[] | null, fullUrl: string): T | null {
+    if (!bundleEntry) {
+      return null;
     }
+    const entry = bundleEntry.find((x) => x['fullUrl'] === fullUrl);
+    return entry?.['resource'];
+  }
 }
-
-
-