@imranq2/fhirpatientsummary 1.0.8 → 1.0.10

package/dist/index.cjs

@@ -949,7 +949,7 @@ var AllergyIntoleranceTemplate = class _AllergyIntoleranceTemplate {
         }
       }
     }
-    let html = `<div xmlns="http://www.w3.org/1999/xhtml">`;
+    let html = "";
     html += `
       <div class="ActiveAllergies">
         <h3>Active Allergies and Intolerances</h3>
@@ -1006,8 +1006,7 @@ var AllergyIntoleranceTemplate = class _AllergyIntoleranceTemplate {
     html += `
           </tbody>
         </table>
-      </div>
-    </div>`;
+      </div>`;
     return html;
   }
   /**
@@ -1117,7 +1116,7 @@ var MedicationSummaryTemplate = class _MedicationSummaryTemplate {
    * @returns HTML string for rendering
    */
   static renderMedicationRequests(templateUtilities, medications) {
-    let html = `<div xmlns="http://www.w3.org/1999/xhtml">
+    let html = `
       <table>
         <thead>
           <tr>
@@ -1167,7 +1166,7 @@ var MedicationSummaryTemplate = class _MedicationSummaryTemplate {
     }
     html += `
         </tbody>
-      </table></div>`;
+      </table>`;
     return html;
   }
   /**
@@ -1177,7 +1176,7 @@ var MedicationSummaryTemplate = class _MedicationSummaryTemplate {
    * @returns HTML string for rendering
    */
   static renderMedicationStatements(templateUtilities, medications) {
-    let html = `<div xmlns="http://www.w3.org/1999/xhtml">
+    let html = `
       <table>
         <thead>
           <tr>
@@ -1221,7 +1220,7 @@ var MedicationSummaryTemplate = class _MedicationSummaryTemplate {
     }
     html += `
         </tbody>
-      </table></div>`;
+      </table>`;
     return html;
   }
 };
@@ -1247,7 +1246,7 @@ var ImmunizationsTemplate = class _ImmunizationsTemplate {
     const templateUtilities = new TemplateUtilities(resource);
     let html = `
       <h5>Immunizations</h5>
-      <table class="hapiPropertyTable">
+      <table>
         <thead>
           <tr>
             <th>Immunization</th>
@@ -1303,7 +1302,7 @@ var ProblemListTemplate = class _ProblemListTemplate {
    */
   static generateStaticNarrative(resource, timezone) {
     const templateUtilities = new TemplateUtilities(resource);
-    let html = `<div xmlns="http://www.w3.org/1999/xhtml">`;
+    let html = ``;
     const activeConditions = [];
     const resolvedConditions = [];
     if (resource.entry && Array.isArray(resource.entry)) {
@@ -1379,7 +1378,6 @@ var ProblemListTemplate = class _ProblemListTemplate {
         </table>
       </div>`;
     }
-    html += `</div>`;
     return html;
   }
 };
@@ -1405,7 +1403,7 @@ var VitalSignsTemplate = class _VitalSignsTemplate {
     const templateUtilities = new TemplateUtilities(resource);
     let html = `
       <h5>Vital Signs</h5>
-      <table class="hapiPropertyTable">
+      <table>
         <thead>
           <tr>
             <th>Code</th>
@@ -1464,7 +1462,7 @@ var MedicalDevicesTemplate = class _MedicalDevicesTemplate {
     const templateUtilities = new TemplateUtilities(resource);
     let html = `
       <h5>Medical Devices</h5>
-      <table class="hapiPropertyTable">
+      <table>
         <thead>
           <tr>
             <th>Device</th>
@@ -1557,7 +1555,7 @@ var DiagnosticResultsTemplate = class _DiagnosticResultsTemplate {
   static renderObservations(templateUtilities, observations, timezone) {
     let html = `
       <h5>Diagnostic Results: Observations</h5>
-      <table class="hapiPropertyTable">
+      <table>
         <thead>
           <tr>
             <th>Code</th>
@@ -1597,7 +1595,7 @@ var DiagnosticResultsTemplate = class _DiagnosticResultsTemplate {
   static renderDiagnosticReports(templateUtilities, reports, timezone) {
     let html = `
       <h5>Diagnostic Results: Reports</h5>
-      <table class="hapiPropertyTable">
+      <table>
         <thead>
           <tr>
             <th>Report</th>
@@ -1650,7 +1648,7 @@ var HistoryOfProceduresTemplate = class _HistoryOfProceduresTemplate {
     const templateUtilities = new TemplateUtilities(resource);
     let html = `
       <h5>History Of Procedures</h5>
-      <table class="hapiPropertyTable">
+      <table>
         <thead>
           <tr>
             <th>Procedure</th>
@@ -1701,7 +1699,7 @@ var SocialHistoryTemplate = class _SocialHistoryTemplate {
     const templateUtilities = new TemplateUtilities(resource);
     let html = `
       <h5>Social History</h5>
-      <table class="hapiPropertyTable">
+      <table>
         <thead>
           <tr>
             <th>Code</th>
@@ -1747,7 +1745,7 @@ var PastHistoryOfIllnessTemplate = class {
     const templateUtilities = new TemplateUtilities(resource);
     let html = `
       <h5>Past History of Illnesses</h5>
-      <table class="hapiPropertyTable">
+      <table>
         <thead>
           <tr>
             <th>Medical Problems</th>
@@ -1792,7 +1790,7 @@ var PlanOfCareTemplate = class {
     const templateUtilities = new TemplateUtilities(resource);
     let html = `
       <h5>Plan of Care</h5>
-      <table class="hapiPropertyTable">
+      <table>
         <thead>
           <tr>
             <th>Activity</th>
@@ -1847,7 +1845,7 @@ var FunctionalStatusTemplate = class _FunctionalStatusTemplate {
     const templateUtilities = new TemplateUtilities(resource);
     let html = `
       <h5>Functional Status</h5>
-      <table class="hapiPropertyTable">
+      <table>
         <thead>
           <tr>
             <th>Assessment</th>
@@ -1902,7 +1900,7 @@ var PregnancyTemplate = class _PregnancyTemplate {
     const templateUtilities = new TemplateUtilities(resource);
     let html = `
       <h5>Pregnancy</h5>
-      <table class="hapiPropertyTable">
+      <table>
         <thead>
           <tr>
             <th>Code</th>
@@ -1956,7 +1954,7 @@ var AdvanceDirectivesTemplate = class _AdvanceDirectivesTemplate {
     const templateUtilities = new TemplateUtilities(resource);
     let html = `
       <h5>Advance Directives</h5>
-      <table class="hapiPropertyTable">
+      <table>
         <thead>
           <tr>
             <th>Scope</th>
@@ -2000,7 +1998,7 @@ var FamilyHistoryTemplate = class {
     const templateUtilities = new TemplateUtilities(resource);
     let html = `
       <h5>Family History</h5>
-      <table class="hapiPropertyTable">
+      <table>
         <thead>
           <tr>
             <th>Relationship</th>
@@ -2081,7 +2079,7 @@ var ClinicalImpressionTemplate = class {
     const templateUtilities = new TemplateUtilities(resource);
     let html = `
       <h5>Clinical Impressions</h5>
-      <table class="hapiPropertyTable">
+      <table>
         <thead>
           <tr>
             <th>Date</th>
@@ -2193,15 +2191,42 @@ TypeScriptTemplateMapper.sectionToTemplate = {
 };
 
 // src/generators/narrative_generator.ts
+var import_html_minifier_terser = require("html-minifier-terser");
+var DEFAULT_MINIFY_OPTIONS = {
+  collapseWhitespace: true,
+  conservativeCollapse: true,
+  // Preserves one whitespace
+  removeComments: true,
+  caseSensitive: true,
+  // Important for XML/XHTML
+  minifyCSS: true,
+  minifyJS: false,
+  decodeEntities: true,
+  keepClosingSlash: true,
+  // Important for XML/XHTML
+  removeEmptyAttributes: true
+};
+var AGGRESSIVE_MINIFY_OPTIONS = {
+  ...DEFAULT_MINIFY_OPTIONS,
+  collapseWhitespace: true,
+  conservativeCollapse: false,
+  // Don't preserve whitespace
+  removeAttributeQuotes: true,
+  removeRedundantAttributes: true,
+  removeEmptyElements: false,
+  // Don't remove empty elements as they may be semantically important
+  removeOptionalTags: true
+};
 var NarrativeGenerator = class {
   /**
    * Generates narrative HTML content for a section
    * @param section - IPS section type
    * @param resources - Array of domain resources
    * @param timezone - Optional timezone to use for date formatting (e.g., 'America/New_York', 'Europe/London')
+   * @param wrapInXhtml - Whether to wrap the content in XHTML div
    * @returns Generated HTML content or undefined if no resources
    */
-  static generateNarrativeContent(section, resources, timezone) {
+  static async generateNarrativeContentAsync(section, resources, timezone, wrapInXhtml = true) {
     if (!resources || resources.length === 0) {
       return void 0;
     }
@@ -2213,48 +2238,81 @@ var NarrativeGenerator = class {
           resource
         }))
       };
-      return TypeScriptTemplateMapper.generateNarrative(section, bundle, timezone);
+      const content = TypeScriptTemplateMapper.generateNarrative(section, bundle, timezone);
+      if (!content) {
+        return void 0;
+      }
+      if (wrapInXhtml) {
+        return await this.wrapInXhtmlAsync(content);
+      } else {
+        return await this.minifyHtmlAsync(content);
+      }
     } catch (error) {
       console.error(`Error generating narrative for section ${section}:`, error);
       return `<div class="error">Error generating narrative: ${error instanceof Error ? error.message : String(error)}</div>`;
     }
   }
   /**
-   * Creates a complete FHIR Narrative object
+   * Minifies HTML content asynchronously using html-minifier-terser
+   * @param html - HTML content to minify
+   * @param aggressive - Whether to use more aggressive minification
+   * @returns Promise that resolves to minified HTML content
+   */
+  static async minifyHtmlAsync(html, aggressive = false) {
+    if (!html) return html;
+    try {
+      const options = aggressive ? AGGRESSIVE_MINIFY_OPTIONS : DEFAULT_MINIFY_OPTIONS;
+      return await (0, import_html_minifier_terser.minify)(html, options);
+    } catch (error) {
+      console.warn("HTML minification failed", error);
+      return html;
+    }
+  }
+  /**
+   * Creates a complete FHIR Narrative object asynchronously
    * @param content - HTML content
-   * @returns FHIR Narrative object
+   * @param minify - Whether to minify the HTML content (default: true)
+   * @returns Promise that resolves to a FHIR Narrative object
    */
-  static createNarrative(content) {
-    content = content.replace(/\s+/g, " ").trim();
+  static async createNarrativeAsync(content, minify = true) {
     const divMatch = content.match(/^<div[^>]*>(.*?)<\/div>$/);
     if (divMatch) {
       content = divMatch[1];
     }
+    if (minify) {
+      content = await this.minifyHtmlAsync(content);
+    }
     return {
       status: "generated",
       div: `<div xmlns="http://www.w3.org/1999/xhtml">${content}</div>`
     };
   }
   /**
-   * Generates a complete FHIR Narrative object for a section
+   * Generates a complete FHIR Narrative object for a section asynchronously
    * @param section - IPS section type
    * @param resources - Array of domain resources
-   * @param timezone - Optional timezone to use for date formatting (e.g., 'America/New_York', 'Europe/London')
-   * @returns FHIR Narrative object or undefined if no resources
+   * @param timezone - Optional timezone to use for date formatting
+   * @param minify - Whether to minify the HTML content (default: true)
+   * @param wrapInXhtml - Whether to wrap the content in XHTML div
+   * @returns Promise that resolves to a FHIR Narrative object or undefined if no resources
    */
-  static generateNarrative(section, resources, timezone) {
-    const content = this.generateNarrativeContent(section, resources, timezone);
+  static async generateNarrativeAsync(section, resources, timezone, minify = true, wrapInXhtml) {
+    const content = await this.generateNarrativeContentAsync(section, resources, timezone, wrapInXhtml);
     if (!content) {
       return void 0;
     }
-    return this.createNarrative(content);
+    return await this.createNarrativeAsync(content, minify);
   }
   /**
-   * Wrap content in XHTML div with FHIR namespace
+   * Wrap content in XHTML div with FHIR namespace asynchronously
    * @param content - HTML content to wrap
-   * @returns XHTML div string
+   * @param minify - Whether to minify the HTML content before wrapping (default: false)
+   * @returns Promise that resolves to XHTML div string
    */
-  static wrapInXhtml(content) {
+  static async wrapInXhtmlAsync(content, minify = false) {
+    if (minify) {
+      content = await this.minifyHtmlAsync(content);
+    }
     return `<div xmlns="http://www.w3.org/1999/xhtml">${content}</div>`;
   }
 };
@@ -2278,8 +2336,14 @@ var ComprehensiveIPSCompositionBuilder = class {
     this.patient = patient;
     return this;
   }
-  // Comprehensive method to add sections with validation
-  addSection(sectionType, resources, timezone, options) {
+  /**
+   * Adds a section to the composition with async HTML minification
+   * @param sectionType - IPS section type
+   * @param resources - Array of domain resources
+   * @param timezone - Optional timezone to use for date formatting
+   * @param options - Optional configuration options
+   */
+  async addSectionAsync(sectionType, resources, timezone, options) {
     const validResources = resources;
     for (const resource of validResources) {
       this.resources.add(resource);
@@ -2291,7 +2355,13 @@ var ComprehensiveIPSCompositionBuilder = class {
       return this;
     }
     if (sectionType !== "Patient" /* PATIENT */) {
-      const narrative = NarrativeGenerator.generateNarrative(sectionType, validResources, timezone);
+      const narrative = await NarrativeGenerator.generateNarrativeAsync(
+        sectionType,
+        validResources,
+        timezone,
+        true,
+        false
+      );
       const sectionEntry = {
         title: IPS_SECTION_DISPLAY_NAMES[sectionType] || sectionType,
         code: {
@@ -2318,9 +2388,9 @@ var ComprehensiveIPSCompositionBuilder = class {
   /**
    * Reads a FHIR Bundle and extracts resources for each section defined in IPSSections.
    * @param bundle - FHIR Bundle containing resources
-   * @param timezone - Optional timezone to use for date formatting (e.g., 'America/New_York', 'Europe/London')
+   * @param timezone - Optional timezone to use for date formatting
    */
-  read_bundle(bundle, timezone) {
+  async readBundleAsync(bundle, timezone) {
     if (!bundle.entry) {
       return this;
     }
@@ -2337,7 +2407,9 @@ var ComprehensiveIPSCompositionBuilder = class {
         resources = resources.filter(customFilter);
       }
       if (resources.length > 0) {
-        this.addSection(sectionType, resources, timezone, { isOptional: true });
+        await this.addSectionAsync(sectionType, resources, timezone, {
+          isOptional: true
+        });
       }
     }
     return this;
@@ -2371,7 +2443,7 @@ var ComprehensiveIPSCompositionBuilder = class {
    * @param baseUrl - Base URL for the FHIR server (e.g., 'https://example.com/fhir')
    * @param timezone - Optional timezone to use for date formatting (e.g., 'America/New_York', 'Europe/London')
    */
-  build_bundle(authorOrganizationId, authorOrganizationName, baseUrl, timezone) {
+  async buildBundleAsync(authorOrganizationId, authorOrganizationName, baseUrl, timezone) {
     if (baseUrl.endsWith("/")) {
       baseUrl = baseUrl.slice(0, -1);
     }
@@ -2400,7 +2472,7 @@ var ComprehensiveIPSCompositionBuilder = class {
       date: (/* @__PURE__ */ new Date()).toISOString(),
       title: "International Patient Summary",
       section: this.sections,
-      text: this.createCompositionNarrative(timezone)
+      text: await this.createCompositionNarrativeAsync(timezone)
     };
     const bundle = {
       resourceType: "Bundle",
@@ -2445,13 +2517,14 @@ var ComprehensiveIPSCompositionBuilder = class {
    * @param timezone - Optional timezone to use for date formatting (e.g., 'America/New_York', 'Europe/London')
    * @private
    */
-  createCompositionNarrative(timezone) {
+  async createCompositionNarrativeAsync(timezone) {
     const patient = this.patient;
     let fullNarrativeContent = "";
-    const patientNarrative = NarrativeGenerator.generateNarrativeContent(
+    const patientNarrative = await NarrativeGenerator.generateNarrativeContentAsync(
       "Patient" /* PATIENT */,
       [patient],
-      timezone
+      timezone,
+      false
     );
     fullNarrativeContent = fullNarrativeContent.concat(patientNarrative || "");
     for (const sectionType of Object.values(IPSSections)) {
@@ -2462,13 +2535,18 @@ var ComprehensiveIPSCompositionBuilder = class {
       const allResources = Array.from(this.resources);
       const resources = allResources.filter((r) => resourceTypesForSection.includes(r.resourceType));
       if (resources.length > 0) {
-        const sectionNarrative = NarrativeGenerator.generateNarrativeContent(sectionType, resources, timezone);
+        const sectionNarrative = await NarrativeGenerator.generateNarrativeContentAsync(
+          sectionType,
+          resources,
+          timezone,
+          false
+        );
         fullNarrativeContent = fullNarrativeContent.concat(sectionNarrative || "");
       }
     }
     return {
       status: "generated",
-      div: NarrativeGenerator.wrapInXhtml(fullNarrativeContent)
+      div: await NarrativeGenerator.wrapInXhtmlAsync(fullNarrativeContent, true)
     };
   }
 };

package/dist/index.d.cts

@@ -643,16 +643,23 @@ declare class ComprehensiveIPSCompositionBuilder {
      * @param patient - FHIR Patient resource to set
      */
     setPatient(patient: TPatient): this;
-    addSection<T extends TDomainResource>(sectionType: IPSSections, resources: T[], timezone: string | undefined, options?: {
+    /**
+     * Adds a section to the composition with async HTML minification
+     * @param sectionType - IPS section type
+     * @param resources - Array of domain resources
+     * @param timezone - Optional timezone to use for date formatting
+     * @param options - Optional configuration options
+     */
+    addSectionAsync<T extends TDomainResource>(sectionType: IPSSections, resources: T[], timezone: string | undefined, options?: {
         isOptional?: boolean;
         customLoincCode?: string;
-    }): this;
+    }): Promise<this>;
     /**
      * Reads a FHIR Bundle and extracts resources for each section defined in IPSSections.
      * @param bundle - FHIR Bundle containing resources
-     * @param timezone - Optional timezone to use for date formatting (e.g., 'America/New_York', 'Europe/London')
+     * @param timezone - Optional timezone to use for date formatting
      */
-    read_bundle(bundle: TBundle, timezone: string | undefined): this;
+    readBundleAsync(bundle: TBundle, timezone: string | undefined): Promise<this>;
     /**
      * Builds the final Composition sections, ensuring all mandatory sections are present.
      * @param timezone - Optional timezone to use for date formatting (e.g., 'America/New_York', 'Europe/London')
@@ -665,13 +672,13 @@ declare class ComprehensiveIPSCompositionBuilder {
      * @param baseUrl - Base URL for the FHIR server (e.g., 'https://example.com/fhir')
      * @param timezone - Optional timezone to use for date formatting (e.g., 'America/New_York', 'Europe/London')
      */
-    build_bundle(authorOrganizationId: string, authorOrganizationName: string, baseUrl: string, timezone: string | undefined): TBundle;
+    buildBundleAsync(authorOrganizationId: string, authorOrganizationName: string, baseUrl: string, timezone: string | undefined): Promise<TBundle>;
     /**
      * Creates a narrative for the composition based on the patient and sections.
      * @param timezone - Optional timezone to use for date formatting (e.g., 'America/New_York', 'Europe/London')
      * @private
      */
-    private createCompositionNarrative;
+    private createCompositionNarrativeAsync;
 }
 
 interface Narrative {
@@ -688,29 +695,41 @@ declare class NarrativeGenerator {
      * @param section - IPS section type
      * @param resources - Array of domain resources
      * @param timezone - Optional timezone to use for date formatting (e.g., 'America/New_York', 'Europe/London')
+     * @param wrapInXhtml - Whether to wrap the content in XHTML div
      * @returns Generated HTML content or undefined if no resources
      */
-    static generateNarrativeContent<T extends TDomainResource>(section: IPSSections, resources: T[], timezone: string | undefined): string | undefined;
+    static generateNarrativeContentAsync<T extends TDomainResource>(section: IPSSections, resources: T[], timezone: string | undefined, wrapInXhtml?: boolean): Promise<string | undefined>;
     /**
-     * Creates a complete FHIR Narrative object
+     * Minifies HTML content asynchronously using html-minifier-terser
+     * @param html - HTML content to minify
+     * @param aggressive - Whether to use more aggressive minification
+     * @returns Promise that resolves to minified HTML content
+     */
+    static minifyHtmlAsync(html: string, aggressive?: boolean): Promise<string>;
+    /**
+     * Creates a complete FHIR Narrative object asynchronously
      * @param content - HTML content
-     * @returns FHIR Narrative object
+     * @param minify - Whether to minify the HTML content (default: true)
+     * @returns Promise that resolves to a FHIR Narrative object
      */
-    static createNarrative(content: string): Narrative;
+    static createNarrativeAsync(content: string, minify?: boolean): Promise<Narrative>;
     /**
-     * Generates a complete FHIR Narrative object for a section
+     * Generates a complete FHIR Narrative object for a section asynchronously
      * @param section - IPS section type
      * @param resources - Array of domain resources
-     * @param timezone - Optional timezone to use for date formatting (e.g., 'America/New_York', 'Europe/London')
-     * @returns FHIR Narrative object or undefined if no resources
+     * @param timezone - Optional timezone to use for date formatting
+     * @param minify - Whether to minify the HTML content (default: true)
+     * @param wrapInXhtml - Whether to wrap the content in XHTML div
+     * @returns Promise that resolves to a FHIR Narrative object or undefined if no resources
      */
-    static generateNarrative<T extends TDomainResource>(section: IPSSections, resources: T[], timezone: string | undefined): Narrative | undefined;
+    static generateNarrativeAsync<T extends TDomainResource>(section: IPSSections, resources: T[], timezone: string | undefined, minify: boolean | undefined, wrapInXhtml: boolean): Promise<Narrative | undefined>;
     /**
-     * Wrap content in XHTML div with FHIR namespace
+     * Wrap content in XHTML div with FHIR namespace asynchronously
      * @param content - HTML content to wrap
-     * @returns XHTML div string
+     * @param minify - Whether to minify the HTML content before wrapping (default: false)
+     * @returns Promise that resolves to XHTML div string
      */
-    static wrapInXhtml(content: string): string;
+    static wrapInXhtmlAsync(content: string, minify?: boolean): Promise<string>;
 }
 
 declare const myPackage: (taco?: string) => string;

package/dist/index.d.ts

@@ -643,16 +643,23 @@ declare class ComprehensiveIPSCompositionBuilder {
      * @param patient - FHIR Patient resource to set
      */
     setPatient(patient: TPatient): this;
-    addSection<T extends TDomainResource>(sectionType: IPSSections, resources: T[], timezone: string | undefined, options?: {
+    /**
+     * Adds a section to the composition with async HTML minification
+     * @param sectionType - IPS section type
+     * @param resources - Array of domain resources
+     * @param timezone - Optional timezone to use for date formatting
+     * @param options - Optional configuration options
+     */
+    addSectionAsync<T extends TDomainResource>(sectionType: IPSSections, resources: T[], timezone: string | undefined, options?: {
         isOptional?: boolean;
         customLoincCode?: string;
-    }): this;
+    }): Promise<this>;
     /**
      * Reads a FHIR Bundle and extracts resources for each section defined in IPSSections.
      * @param bundle - FHIR Bundle containing resources
-     * @param timezone - Optional timezone to use for date formatting (e.g., 'America/New_York', 'Europe/London')
+     * @param timezone - Optional timezone to use for date formatting
      */
-    read_bundle(bundle: TBundle, timezone: string | undefined): this;
+    readBundleAsync(bundle: TBundle, timezone: string | undefined): Promise<this>;
     /**
      * Builds the final Composition sections, ensuring all mandatory sections are present.
      * @param timezone - Optional timezone to use for date formatting (e.g., 'America/New_York', 'Europe/London')
@@ -665,13 +672,13 @@ declare class ComprehensiveIPSCompositionBuilder {
      * @param baseUrl - Base URL for the FHIR server (e.g., 'https://example.com/fhir')
      * @param timezone - Optional timezone to use for date formatting (e.g., 'America/New_York', 'Europe/London')
      */
-    build_bundle(authorOrganizationId: string, authorOrganizationName: string, baseUrl: string, timezone: string | undefined): TBundle;
+    buildBundleAsync(authorOrganizationId: string, authorOrganizationName: string, baseUrl: string, timezone: string | undefined): Promise<TBundle>;
     /**
      * Creates a narrative for the composition based on the patient and sections.
      * @param timezone - Optional timezone to use for date formatting (e.g., 'America/New_York', 'Europe/London')
      * @private
      */
-    private createCompositionNarrative;
+    private createCompositionNarrativeAsync;
 }
 
 interface Narrative {
@@ -688,29 +695,41 @@ declare class NarrativeGenerator {
      * @param section - IPS section type
      * @param resources - Array of domain resources
      * @param timezone - Optional timezone to use for date formatting (e.g., 'America/New_York', 'Europe/London')
+     * @param wrapInXhtml - Whether to wrap the content in XHTML div
      * @returns Generated HTML content or undefined if no resources
      */
-    static generateNarrativeContent<T extends TDomainResource>(section: IPSSections, resources: T[], timezone: string | undefined): string | undefined;
+    static generateNarrativeContentAsync<T extends TDomainResource>(section: IPSSections, resources: T[], timezone: string | undefined, wrapInXhtml?: boolean): Promise<string | undefined>;
     /**
-     * Creates a complete FHIR Narrative object
+     * Minifies HTML content asynchronously using html-minifier-terser
+     * @param html - HTML content to minify
+     * @param aggressive - Whether to use more aggressive minification
+     * @returns Promise that resolves to minified HTML content
+     */
+    static minifyHtmlAsync(html: string, aggressive?: boolean): Promise<string>;
+    /**
+     * Creates a complete FHIR Narrative object asynchronously
      * @param content - HTML content
-     * @returns FHIR Narrative object
+     * @param minify - Whether to minify the HTML content (default: true)
+     * @returns Promise that resolves to a FHIR Narrative object
      */
-    static createNarrative(content: string): Narrative;
+    static createNarrativeAsync(content: string, minify?: boolean): Promise<Narrative>;
     /**
-     * Generates a complete FHIR Narrative object for a section
+     * Generates a complete FHIR Narrative object for a section asynchronously
      * @param section - IPS section type
      * @param resources - Array of domain resources
-     * @param timezone - Optional timezone to use for date formatting (e.g., 'America/New_York', 'Europe/London')
-     * @returns FHIR Narrative object or undefined if no resources
+     * @param timezone - Optional timezone to use for date formatting
+     * @param minify - Whether to minify the HTML content (default: true)
+     * @param wrapInXhtml - Whether to wrap the content in XHTML div
+     * @returns Promise that resolves to a FHIR Narrative object or undefined if no resources
      */
-    static generateNarrative<T extends TDomainResource>(section: IPSSections, resources: T[], timezone: string | undefined): Narrative | undefined;
+    static generateNarrativeAsync<T extends TDomainResource>(section: IPSSections, resources: T[], timezone: string | undefined, minify: boolean | undefined, wrapInXhtml: boolean): Promise<Narrative | undefined>;
     /**
-     * Wrap content in XHTML div with FHIR namespace
+     * Wrap content in XHTML div with FHIR namespace asynchronously
      * @param content - HTML content to wrap
-     * @returns XHTML div string
+     * @param minify - Whether to minify the HTML content before wrapping (default: false)
+     * @returns Promise that resolves to XHTML div string
      */
-    static wrapInXhtml(content: string): string;
+    static wrapInXhtmlAsync(content: string, minify?: boolean): Promise<string>;
 }
 
 declare const myPackage: (taco?: string) => string;

package/dist/index.js

@@ -921,7 +921,7 @@ var AllergyIntoleranceTemplate = class _AllergyIntoleranceTemplate {
         }
       }
     }
-    let html = `<div xmlns="http://www.w3.org/1999/xhtml">`;
+    let html = "";
     html += `
       <div class="ActiveAllergies">
         <h3>Active Allergies and Intolerances</h3>
@@ -978,8 +978,7 @@ var AllergyIntoleranceTemplate = class _AllergyIntoleranceTemplate {
     html += `
           </tbody>
         </table>
-      </div>
-    </div>`;
+      </div>`;
     return html;
   }
   /**
@@ -1089,7 +1088,7 @@ var MedicationSummaryTemplate = class _MedicationSummaryTemplate {
    * @returns HTML string for rendering
    */
   static renderMedicationRequests(templateUtilities, medications) {
-    let html = `<div xmlns="http://www.w3.org/1999/xhtml">
+    let html = `
       <table>
         <thead>
           <tr>
@@ -1139,7 +1138,7 @@ var MedicationSummaryTemplate = class _MedicationSummaryTemplate {
     }
     html += `
         </tbody>
-      </table></div>`;
+      </table>`;
     return html;
   }
   /**
@@ -1149,7 +1148,7 @@ var MedicationSummaryTemplate = class _MedicationSummaryTemplate {
    * @returns HTML string for rendering
    */
   static renderMedicationStatements(templateUtilities, medications) {
-    let html = `<div xmlns="http://www.w3.org/1999/xhtml">
+    let html = `
       <table>
         <thead>
           <tr>
@@ -1193,7 +1192,7 @@ var MedicationSummaryTemplate = class _MedicationSummaryTemplate {
     }
     html += `
         </tbody>
-      </table></div>`;
+      </table>`;
     return html;
   }
 };
@@ -1219,7 +1218,7 @@ var ImmunizationsTemplate = class _ImmunizationsTemplate {
     const templateUtilities = new TemplateUtilities(resource);
     let html = `
       <h5>Immunizations</h5>
-      <table class="hapiPropertyTable">
+      <table>
         <thead>
           <tr>
             <th>Immunization</th>
@@ -1275,7 +1274,7 @@ var ProblemListTemplate = class _ProblemListTemplate {
    */
   static generateStaticNarrative(resource, timezone) {
     const templateUtilities = new TemplateUtilities(resource);
-    let html = `<div xmlns="http://www.w3.org/1999/xhtml">`;
+    let html = ``;
     const activeConditions = [];
     const resolvedConditions = [];
     if (resource.entry && Array.isArray(resource.entry)) {
@@ -1351,7 +1350,6 @@ var ProblemListTemplate = class _ProblemListTemplate {
         </table>
       </div>`;
     }
-    html += `</div>`;
     return html;
   }
 };
@@ -1377,7 +1375,7 @@ var VitalSignsTemplate = class _VitalSignsTemplate {
     const templateUtilities = new TemplateUtilities(resource);
     let html = `
       <h5>Vital Signs</h5>
-      <table class="hapiPropertyTable">
+      <table>
         <thead>
           <tr>
             <th>Code</th>
@@ -1436,7 +1434,7 @@ var MedicalDevicesTemplate = class _MedicalDevicesTemplate {
     const templateUtilities = new TemplateUtilities(resource);
     let html = `
       <h5>Medical Devices</h5>
-      <table class="hapiPropertyTable">
+      <table>
         <thead>
           <tr>
             <th>Device</th>
@@ -1529,7 +1527,7 @@ var DiagnosticResultsTemplate = class _DiagnosticResultsTemplate {
   static renderObservations(templateUtilities, observations, timezone) {
     let html = `
       <h5>Diagnostic Results: Observations</h5>
-      <table class="hapiPropertyTable">
+      <table>
         <thead>
           <tr>
             <th>Code</th>
@@ -1569,7 +1567,7 @@ var DiagnosticResultsTemplate = class _DiagnosticResultsTemplate {
   static renderDiagnosticReports(templateUtilities, reports, timezone) {
     let html = `
       <h5>Diagnostic Results: Reports</h5>
-      <table class="hapiPropertyTable">
+      <table>
         <thead>
           <tr>
             <th>Report</th>
@@ -1622,7 +1620,7 @@ var HistoryOfProceduresTemplate = class _HistoryOfProceduresTemplate {
     const templateUtilities = new TemplateUtilities(resource);
     let html = `
       <h5>History Of Procedures</h5>
-      <table class="hapiPropertyTable">
+      <table>
         <thead>
           <tr>
             <th>Procedure</th>
@@ -1673,7 +1671,7 @@ var SocialHistoryTemplate = class _SocialHistoryTemplate {
     const templateUtilities = new TemplateUtilities(resource);
     let html = `
       <h5>Social History</h5>
-      <table class="hapiPropertyTable">
+      <table>
         <thead>
           <tr>
             <th>Code</th>
@@ -1719,7 +1717,7 @@ var PastHistoryOfIllnessTemplate = class {
     const templateUtilities = new TemplateUtilities(resource);
     let html = `
       <h5>Past History of Illnesses</h5>
-      <table class="hapiPropertyTable">
+      <table>
         <thead>
           <tr>
             <th>Medical Problems</th>
@@ -1764,7 +1762,7 @@ var PlanOfCareTemplate = class {
     const templateUtilities = new TemplateUtilities(resource);
     let html = `
       <h5>Plan of Care</h5>
-      <table class="hapiPropertyTable">
+      <table>
         <thead>
           <tr>
             <th>Activity</th>
@@ -1819,7 +1817,7 @@ var FunctionalStatusTemplate = class _FunctionalStatusTemplate {
     const templateUtilities = new TemplateUtilities(resource);
     let html = `
       <h5>Functional Status</h5>
-      <table class="hapiPropertyTable">
+      <table>
         <thead>
           <tr>
             <th>Assessment</th>
@@ -1874,7 +1872,7 @@ var PregnancyTemplate = class _PregnancyTemplate {
     const templateUtilities = new TemplateUtilities(resource);
     let html = `
       <h5>Pregnancy</h5>
-      <table class="hapiPropertyTable">
+      <table>
         <thead>
           <tr>
             <th>Code</th>
@@ -1928,7 +1926,7 @@ var AdvanceDirectivesTemplate = class _AdvanceDirectivesTemplate {
     const templateUtilities = new TemplateUtilities(resource);
     let html = `
       <h5>Advance Directives</h5>
-      <table class="hapiPropertyTable">
+      <table>
         <thead>
           <tr>
             <th>Scope</th>
@@ -1972,7 +1970,7 @@ var FamilyHistoryTemplate = class {
     const templateUtilities = new TemplateUtilities(resource);
     let html = `
       <h5>Family History</h5>
-      <table class="hapiPropertyTable">
+      <table>
         <thead>
           <tr>
             <th>Relationship</th>
@@ -2053,7 +2051,7 @@ var ClinicalImpressionTemplate = class {
     const templateUtilities = new TemplateUtilities(resource);
     let html = `
       <h5>Clinical Impressions</h5>
-      <table class="hapiPropertyTable">
+      <table>
         <thead>
           <tr>
             <th>Date</th>
@@ -2165,15 +2163,42 @@ TypeScriptTemplateMapper.sectionToTemplate = {
 };
 
 // src/generators/narrative_generator.ts
+import { minify as htmlMinify } from "html-minifier-terser";
+var DEFAULT_MINIFY_OPTIONS = {
+  collapseWhitespace: true,
+  conservativeCollapse: true,
+  // Preserves one whitespace
+  removeComments: true,
+  caseSensitive: true,
+  // Important for XML/XHTML
+  minifyCSS: true,
+  minifyJS: false,
+  decodeEntities: true,
+  keepClosingSlash: true,
+  // Important for XML/XHTML
+  removeEmptyAttributes: true
+};
+var AGGRESSIVE_MINIFY_OPTIONS = {
+  ...DEFAULT_MINIFY_OPTIONS,
+  collapseWhitespace: true,
+  conservativeCollapse: false,
+  // Don't preserve whitespace
+  removeAttributeQuotes: true,
+  removeRedundantAttributes: true,
+  removeEmptyElements: false,
+  // Don't remove empty elements as they may be semantically important
+  removeOptionalTags: true
+};
 var NarrativeGenerator = class {
   /**
    * Generates narrative HTML content for a section
    * @param section - IPS section type
    * @param resources - Array of domain resources
    * @param timezone - Optional timezone to use for date formatting (e.g., 'America/New_York', 'Europe/London')
+   * @param wrapInXhtml - Whether to wrap the content in XHTML div
    * @returns Generated HTML content or undefined if no resources
    */
-  static generateNarrativeContent(section, resources, timezone) {
+  static async generateNarrativeContentAsync(section, resources, timezone, wrapInXhtml = true) {
     if (!resources || resources.length === 0) {
       return void 0;
     }
@@ -2185,48 +2210,81 @@ var NarrativeGenerator = class {
           resource
         }))
       };
-      return TypeScriptTemplateMapper.generateNarrative(section, bundle, timezone);
+      const content = TypeScriptTemplateMapper.generateNarrative(section, bundle, timezone);
+      if (!content) {
+        return void 0;
+      }
+      if (wrapInXhtml) {
+        return await this.wrapInXhtmlAsync(content);
+      } else {
+        return await this.minifyHtmlAsync(content);
+      }
     } catch (error) {
       console.error(`Error generating narrative for section ${section}:`, error);
       return `<div class="error">Error generating narrative: ${error instanceof Error ? error.message : String(error)}</div>`;
     }
   }
   /**
-   * Creates a complete FHIR Narrative object
+   * Minifies HTML content asynchronously using html-minifier-terser
+   * @param html - HTML content to minify
+   * @param aggressive - Whether to use more aggressive minification
+   * @returns Promise that resolves to minified HTML content
+   */
+  static async minifyHtmlAsync(html, aggressive = false) {
+    if (!html) return html;
+    try {
+      const options = aggressive ? AGGRESSIVE_MINIFY_OPTIONS : DEFAULT_MINIFY_OPTIONS;
+      return await htmlMinify(html, options);
+    } catch (error) {
+      console.warn("HTML minification failed", error);
+      return html;
+    }
+  }
+  /**
+   * Creates a complete FHIR Narrative object asynchronously
    * @param content - HTML content
-   * @returns FHIR Narrative object
+   * @param minify - Whether to minify the HTML content (default: true)
+   * @returns Promise that resolves to a FHIR Narrative object
    */
-  static createNarrative(content) {
-    content = content.replace(/\s+/g, " ").trim();
+  static async createNarrativeAsync(content, minify = true) {
     const divMatch = content.match(/^<div[^>]*>(.*?)<\/div>$/);
     if (divMatch) {
       content = divMatch[1];
     }
+    if (minify) {
+      content = await this.minifyHtmlAsync(content);
+    }
     return {
       status: "generated",
       div: `<div xmlns="http://www.w3.org/1999/xhtml">${content}</div>`
     };
   }
   /**
-   * Generates a complete FHIR Narrative object for a section
+   * Generates a complete FHIR Narrative object for a section asynchronously
    * @param section - IPS section type
    * @param resources - Array of domain resources
-   * @param timezone - Optional timezone to use for date formatting (e.g., 'America/New_York', 'Europe/London')
-   * @returns FHIR Narrative object or undefined if no resources
+   * @param timezone - Optional timezone to use for date formatting
+   * @param minify - Whether to minify the HTML content (default: true)
+   * @param wrapInXhtml - Whether to wrap the content in XHTML div
+   * @returns Promise that resolves to a FHIR Narrative object or undefined if no resources
    */
-  static generateNarrative(section, resources, timezone) {
-    const content = this.generateNarrativeContent(section, resources, timezone);
+  static async generateNarrativeAsync(section, resources, timezone, minify = true, wrapInXhtml) {
+    const content = await this.generateNarrativeContentAsync(section, resources, timezone, wrapInXhtml);
     if (!content) {
       return void 0;
     }
-    return this.createNarrative(content);
+    return await this.createNarrativeAsync(content, minify);
   }
   /**
-   * Wrap content in XHTML div with FHIR namespace
+   * Wrap content in XHTML div with FHIR namespace asynchronously
    * @param content - HTML content to wrap
-   * @returns XHTML div string
+   * @param minify - Whether to minify the HTML content before wrapping (default: false)
+   * @returns Promise that resolves to XHTML div string
    */
-  static wrapInXhtml(content) {
+  static async wrapInXhtmlAsync(content, minify = false) {
+    if (minify) {
+      content = await this.minifyHtmlAsync(content);
+    }
     return `<div xmlns="http://www.w3.org/1999/xhtml">${content}</div>`;
   }
 };
@@ -2250,8 +2308,14 @@ var ComprehensiveIPSCompositionBuilder = class {
     this.patient = patient;
     return this;
   }
-  // Comprehensive method to add sections with validation
-  addSection(sectionType, resources, timezone, options) {
+  /**
+   * Adds a section to the composition with async HTML minification
+   * @param sectionType - IPS section type
+   * @param resources - Array of domain resources
+   * @param timezone - Optional timezone to use for date formatting
+   * @param options - Optional configuration options
+   */
+  async addSectionAsync(sectionType, resources, timezone, options) {
     const validResources = resources;
     for (const resource of validResources) {
       this.resources.add(resource);
@@ -2263,7 +2327,13 @@ var ComprehensiveIPSCompositionBuilder = class {
       return this;
     }
     if (sectionType !== "Patient" /* PATIENT */) {
-      const narrative = NarrativeGenerator.generateNarrative(sectionType, validResources, timezone);
+      const narrative = await NarrativeGenerator.generateNarrativeAsync(
+        sectionType,
+        validResources,
+        timezone,
+        true,
+        false
+      );
       const sectionEntry = {
         title: IPS_SECTION_DISPLAY_NAMES[sectionType] || sectionType,
         code: {
@@ -2290,9 +2360,9 @@ var ComprehensiveIPSCompositionBuilder = class {
   /**
    * Reads a FHIR Bundle and extracts resources for each section defined in IPSSections.
    * @param bundle - FHIR Bundle containing resources
-   * @param timezone - Optional timezone to use for date formatting (e.g., 'America/New_York', 'Europe/London')
+   * @param timezone - Optional timezone to use for date formatting
    */
-  read_bundle(bundle, timezone) {
+  async readBundleAsync(bundle, timezone) {
     if (!bundle.entry) {
       return this;
     }
@@ -2309,7 +2379,9 @@ var ComprehensiveIPSCompositionBuilder = class {
         resources = resources.filter(customFilter);
       }
       if (resources.length > 0) {
-        this.addSection(sectionType, resources, timezone, { isOptional: true });
+        await this.addSectionAsync(sectionType, resources, timezone, {
+          isOptional: true
+        });
       }
     }
     return this;
@@ -2343,7 +2415,7 @@ var ComprehensiveIPSCompositionBuilder = class {
    * @param baseUrl - Base URL for the FHIR server (e.g., 'https://example.com/fhir')
    * @param timezone - Optional timezone to use for date formatting (e.g., 'America/New_York', 'Europe/London')
    */
-  build_bundle(authorOrganizationId, authorOrganizationName, baseUrl, timezone) {
+  async buildBundleAsync(authorOrganizationId, authorOrganizationName, baseUrl, timezone) {
     if (baseUrl.endsWith("/")) {
       baseUrl = baseUrl.slice(0, -1);
     }
@@ -2372,7 +2444,7 @@ var ComprehensiveIPSCompositionBuilder = class {
       date: (/* @__PURE__ */ new Date()).toISOString(),
       title: "International Patient Summary",
       section: this.sections,
-      text: this.createCompositionNarrative(timezone)
+      text: await this.createCompositionNarrativeAsync(timezone)
     };
     const bundle = {
       resourceType: "Bundle",
@@ -2417,13 +2489,14 @@ var ComprehensiveIPSCompositionBuilder = class {
    * @param timezone - Optional timezone to use for date formatting (e.g., 'America/New_York', 'Europe/London')
    * @private
    */
-  createCompositionNarrative(timezone) {
+  async createCompositionNarrativeAsync(timezone) {
     const patient = this.patient;
     let fullNarrativeContent = "";
-    const patientNarrative = NarrativeGenerator.generateNarrativeContent(
+    const patientNarrative = await NarrativeGenerator.generateNarrativeContentAsync(
       "Patient" /* PATIENT */,
       [patient],
-      timezone
+      timezone,
+      false
     );
     fullNarrativeContent = fullNarrativeContent.concat(patientNarrative || "");
     for (const sectionType of Object.values(IPSSections)) {
@@ -2434,13 +2507,18 @@ var ComprehensiveIPSCompositionBuilder = class {
       const allResources = Array.from(this.resources);
       const resources = allResources.filter((r) => resourceTypesForSection.includes(r.resourceType));
       if (resources.length > 0) {
-        const sectionNarrative = NarrativeGenerator.generateNarrativeContent(sectionType, resources, timezone);
+        const sectionNarrative = await NarrativeGenerator.generateNarrativeContentAsync(
+          sectionType,
+          resources,
+          timezone,
+          false
+        );
         fullNarrativeContent = fullNarrativeContent.concat(sectionNarrative || "");
       }
     }
     return {
       status: "generated",
-      div: NarrativeGenerator.wrapInXhtml(fullNarrativeContent)
+      div: await NarrativeGenerator.wrapInXhtmlAsync(fullNarrativeContent, true)
     };
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@imranq2/fhirpatientsummary",
-  "version": "1.0.8",
+  "version": "1.0.10",
   "description": "A template for creating npm packages using TypeScript and VSCode",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",
@@ -34,9 +34,9 @@
     "test:watch": "jest --watch",
     "test": "jest --coverage",
     "typecheck": "tsc --noEmit",
-    "check:cjs-import": "node test/build/cjs-import-check.cjs",
-    "check:esm-import": "node --experimental-vm-modules test/build/esm-import-check.mjs",
-    "check:ts-import": "ts-node --project tsconfig.json test/build/ts-import-check.ts"
+    "check:cjs-import": "node tests/build/cjs-import-check.cjs",
+    "check:esm-import": "node --experimental-vm-modules tests/build/esm-import-check.mjs",
+    "check:ts-import": "ts-node --project tsconfig.json tests/build/ts-import-check.ts"
   },
   "repository": {
     "type": "git",
@@ -67,11 +67,13 @@
   },
   "homepage": "https://github.com/icanbwell/fhir-patient-summary#readme",
   "dependencies": {
+    "html-minifier-terser": "^7.2.0",
     "luxon": "^3.6.1",
     "turndown": "^7.2.0"
   },
   "devDependencies": {
     "@eslint/js": "^9.29.0",
+    "@types/html-minifier-terser": "^7.0.2",
     "@types/jest": "^30.0.0",
     "@types/js-beautify": "^1.14.3",
     "@types/luxon": "^3.6.2",