fhir-dosage-utils 1.2.1 → 1.3.1

package/dist/module.js

@@ -1,10 +1,11 @@
+import $hgUW1$i18nextresourcestobackend from "i18next-resources-to-backend";
 import $hgUW1$i18next from "i18next";
 import $hgUW1$i18nextchainedbackend from "i18next-chained-backend";
-import $hgUW1$i18nextresourcestobackend from "i18next-resources-to-backend";
-
 
+// Classe(s)
 
 
+// Types
 function $a620268c8b5a46fd$export$b1a6aed91fad1636({ quantity: quantity }) {
     if (quantity.code !== undefined) return quantity.code;
     if (quantity.unit !== undefined) return quantity.unit;
@@ -34,6 +35,133 @@ function $a31aaee21175037d$export$30c337e25ab8e95b({ extensions: extensions }) {
 }
 
 
+const $c03f5f20816d8d50$export$38cd8db2db178f58 = {
+    language: "en",
+    fromFHIRQuantityUnitToString: (0, $a620268c8b5a46fd$export$b1a6aed91fad1636),
+    fromCodeableConceptToString: (0, $f2878500cc217687$export$f478f96b98da13a4),
+    fromExtensionsToString: (0, $a31aaee21175037d$export$30c337e25ab8e95b),
+    displayOrder: [
+        "method",
+        "doseQuantity",
+        "doseRange",
+        "rateRatio",
+        "rateQuantity",
+        "rateRange",
+        "durationDurationMax",
+        "frequencyFrequencyMaxPeriodPeriodMax",
+        "offsetWhen",
+        "dayOfWeek",
+        "timeOfDay",
+        "route",
+        "site",
+        "asNeeded",
+        "boundsDuration",
+        "boundsPeriod",
+        "boundsRange",
+        "countCountMax",
+        "event",
+        "code",
+        "maxDosePerPeriod",
+        "maxDosePerAdministration",
+        "maxDosePerLifetime",
+        "additionalInstruction",
+        "patientInstruction"
+    ],
+    displaySeparator: " - ",
+    dateTimeFormatOptions: {}
+};
+
+
+class $2422495f2648c580$export$f807d9a22ff8372d {
+    // Set up lib, according provided parameters
+    constructor(userConfig, i18nConfig){
+        // User config
+        this.config = {
+            // default attributes
+            ...(0, $c03f5f20816d8d50$export$38cd8db2db178f58),
+            // attributes set by user
+            ...userConfig
+        };
+        // I18N config
+        this.i18nConfig = {
+            // default attributes
+            fallbackLng: "en",
+            lng: this.config.language,
+            ns: [
+                "common",
+                "daysOfWeek",
+                "eventTiming",
+                "unitsOfTime"
+            ],
+            defaultNS: "common",
+            // attributes set by user
+            ...i18nConfig
+        };
+        this.i18nInstance = (0, $hgUW1$i18next).createInstance();
+    }
+    /**
+   * To init i18next properly according requested criteria
+   */ async init() {
+        // You should wait for init to complete (wait for the callback or promise resolution)
+        // before using the t function!
+        return await this.i18nInstance.use((0, $hgUW1$i18nextchainedbackend)).init(this.i18nConfig);
+    }
+    /**
+   * To change language
+   */ async changeLanguage(lng) {
+        this.config = {
+            ...this.config,
+            language: lng
+        };
+        return this.i18nInstance.changeLanguage(lng);
+    }
+    /**
+   * Get current language
+   */ getLanguage() {
+        return this.config.language;
+    }
+    /**
+   * To change display order
+   */ changeDisplayOrder(order) {
+        this.config = {
+            ...this.config,
+            displayOrder: order
+        };
+    }
+    /**
+   * Get display order
+   */ getDisplayOrder() {
+        return this.config.displayOrder;
+    }
+    /**
+   * Get display separator
+   */ getDisplaySeparator() {
+        return this.config.displaySeparator;
+    }
+    /**
+   * Set display separator
+   */ changeDisplaySeparator(sep) {
+        this.config = {
+            ...this.config,
+            displaySeparator: sep
+        };
+    }
+    /**
+   * Get date time format options
+   */ getDateTimeFormatOptions() {
+        return this.config.dateTimeFormatOptions;
+    }
+    /**
+   * Set date time format options
+   */ changeDateTimeFormatOptions(opts) {
+        this.config = {
+            ...this.config,
+            dateTimeFormatOptions: opts
+        };
+    }
+}
+
+
 // translators
 // To avoid circular dependancies issue, let's have a single place for exports and imports
 // Types
@@ -194,8 +322,10 @@ function $eb371feb739abc89$export$fdc6e9cbd31555fb({ ratio: ratio, config: confi
     // quantity
     let quantityNumerator = numerator?.value;
     let quantityDenominator = denominator?.value;
-    // Collect
+    // Collect results
     const parts = [];
+    let noUnits = numeratorUnit === undefined && denominatorUnit === undefined;
+    let separator = noUnits ? "" : " ";
     // Deal with numerator first
     if (quantityNumerator !== undefined) {
         let technicalKey = numeratorUnit !== undefined ? "withUnit" : "withoutUnit";
@@ -216,7 +346,7 @@ function $eb371feb739abc89$export$fdc6e9cbd31555fb({ ratio: ratio, config: confi
     }
     // Concatenate the result
     if (parts.length === 0) return undefined;
-    else return parts.join(" ");
+    else return parts.join(separator);
 }
 
 
@@ -884,155 +1014,24 @@ function $9b1af2fba509609e$export$9f330b4bf8c0975c({ entry: entry, ...args }) {
 
 
 
-class $8435b8d847fb3eb7$export$1c191bca55f84a03 {
-    // Set up lib, according provided parameters
-    constructor(args){
-        this.config = {
-            // default attributes
-            language: "en",
-            fromFHIRQuantityUnitToString: (0, $a620268c8b5a46fd$export$b1a6aed91fad1636),
-            fromCodeableConceptToString: (0, $f2878500cc217687$export$f478f96b98da13a4),
-            fromExtensionsToString: (0, $a31aaee21175037d$export$30c337e25ab8e95b),
-            displayOrder: [
-                "method",
-                "doseQuantity",
-                "doseRange",
-                "rateRatio",
-                "rateQuantity",
-                "rateRange",
-                "durationDurationMax",
-                "frequencyFrequencyMaxPeriodPeriodMax",
-                "offsetWhen",
-                "dayOfWeek",
-                "timeOfDay",
-                "route",
-                "site",
-                "asNeeded",
-                "boundsDuration",
-                "boundsPeriod",
-                "boundsRange",
-                "countCountMax",
-                "event",
-                "code",
-                "maxDosePerPeriod",
-                "maxDosePerAdministration",
-                "maxDosePerLifetime",
-                "additionalInstruction",
-                "patientInstruction"
-            ],
-            displaySeparator: " - ",
-            dateTimeFormatOptions: {},
-            // attributes set by user
-            ...args
-        };
-        this.i18nInstance = (0, $hgUW1$i18next).createInstance();
-    }
-    /**
-   * To init i18next properly according requested criteria
-   */ async init() {
-        // You should wait for init to complete (wait for the callback or promise resolution)
-        // before using the t function!
-        return await this.i18nInstance.use((0, $hgUW1$i18nextchainedbackend)).init({
-            //debug: true,
-            fallbackLng: "en",
-            lng: this.config.language,
-            ns: [
-                "common",
-                "daysOfWeek",
-                "eventTiming",
-                "unitsOfTime"
-            ],
-            defaultNS: "common",
-            backend: {
-                backends: [
-                    (0, $hgUW1$i18nextresourcestobackend)(// have to cast the function to be webpack / builder friendly
-                    async (lng, ns)=>import(`./locales/${lng}/${ns}.json`))
-                ]
-            }
-        });
+
+const $8435b8d847fb3eb7$var$defaultI18NConfig = {
+    backend: {
+        backends: [
+            (0, $hgUW1$i18nextresourcestobackend)(// have to cast the function to be webpack / builder friendly
+            async (lng, ns)=>import(`./locales/${lng}/${ns}.json`))
+        ]
     }
+};
+class $8435b8d847fb3eb7$export$1c191bca55f84a03 extends (0, $2422495f2648c580$export$f807d9a22ff8372d) {
     /**
    * Factory to create a fine-tuned instance of the utility class
-   */ static async build(args) {
-        const instance = new $8435b8d847fb3eb7$export$1c191bca55f84a03(args);
+   */ static async build(userConfig, i18nConfig = $8435b8d847fb3eb7$var$defaultI18NConfig) {
+        const instance = new $8435b8d847fb3eb7$export$1c191bca55f84a03(userConfig, i18nConfig);
         await instance.init();
         return instance;
     }
     /**
-   * To change language
-   */ async changeLanguage(lng) {
-        this.config = {
-            ...this.config,
-            language: lng
-        };
-        return this.i18nInstance.changeLanguage(lng);
-    }
-    /**
-   * Get current language
-   */ getLanguage() {
-        return this.config.language;
-    }
-    /**
-   * To change display order
-   */ changeDisplayOrder(order) {
-        this.config = {
-            ...this.config,
-            displayOrder: order
-        };
-    }
-    /**
-   * Get display order
-   */ getDisplayOrder() {
-        return this.config.displayOrder;
-    }
-    /**
-   * Get display separator
-   */ getDisplaySeparator() {
-        return this.config.displaySeparator;
-    }
-    /**
-   * Set display separator
-   */ changeDisplaySeparator(sep) {
-        this.config = {
-            ...this.config,
-            displaySeparator: sep
-        };
-    }
-    /**
-   * Get date time format options
-   */ getDateTimeFormatOptions() {
-        return this.config.dateTimeFormatOptions;
-    }
-    /**
-   * Set date time format options
-   */ changeDateTimeFormatOptions(opts) {
-        this.config = {
-            ...this.config,
-            dateTimeFormatOptions: opts
-        };
-    }
-    /**
-   * From a single dosage, extract specific field(s) requested by user.
-   * Some use cases could request to split part of the object for given needs (quantity and timing separately)
-   */ getFields(dos, ...order) {
-        // iterate on each key and generate a string from each part
-        let parts = order.map((entry)=>(0, $9b1af2fba509609e$export$9f330b4bf8c0975c)({
-                config: this.config,
-                dos: dos,
-                entry: entry,
-                i18next: this.i18nInstance
-            })).filter((s)=>s !== undefined);
-        // Join each part with a separator
-        return parts.join(this.config.displaySeparator);
-    }
-    /**
-   * Turn a FHIR Dosage object into text
-   */ fromDosageToText(dos) {
-        // iterate on each key and generate a string from each part
-        let order = this.config.displayOrder;
-        return this.getFields(dos, ...order);
-    }
-    /**
    * Does this array of Dosage objects contains only "sequential" instructions ?
    */ containsOnlySequentialInstructions(dosages) {
         // 1. Collect all sequences number
@@ -1075,6 +1074,27 @@ class $8435b8d847fb3eb7$export$1c191bca55f84a03 {
         });
     }
     /**
+   * From a single dosage, extract specific field(s) requested by user.
+   * Some use cases could request to split part of the object for given needs (quantity and timing separately)
+   */ getFields(dos, ...order) {
+        // iterate on each key and generate a string from each part
+        let parts = order.map((entry)=>(0, $9b1af2fba509609e$export$9f330b4bf8c0975c)({
+                config: this.config,
+                dos: dos,
+                entry: entry,
+                i18next: this.i18nInstance
+            })).filter((s)=>s !== undefined);
+        // Join each part with a separator
+        return parts.join(this.config.displaySeparator);
+    }
+    /**
+   * Turn a FHIR Dosage object into text
+   */ fromDosageToText(dos) {
+        // iterate on each key and generate a string from each part
+        let order = this.config.displayOrder;
+        return this.getFields(dos, ...order);
+    }
+    /**
    * Turn multiple FHIR Dosage objects into text
    */ fromMultipleDosageToText(dosages) {
         // As we can have concurrent / sequential instructions, we need a generic algorithm to do the job