fhir-dosage-utils 1.1.1 → 1.2.1

package/dist/module.js

@@ -36,18 +36,27 @@ function $a31aaee21175037d$export$30c337e25ab8e95b({ extensions: extensions }) {
 
 // translators
 // To avoid circular dependancies issue, let's have a single place for exports and imports
-// types
-function $7cf24331c38efaf1$export$7de3722258b87db9({ config: config, dos: dos, i18next: i18next }) {
+// Types
+function $a8a8a2e7c5a5225c$export$76d408d587da5203(dos, key) {
     // If empty, return undefined
     if (dos.doseAndRate === undefined) return undefined;
     // Find the first entry that match criteria
-    let doseQuantity = dos.doseAndRate.find((s)=>s.doseQuantity !== undefined);
+    let doseAndRate = dos.doseAndRate.find((s)=>s[key] !== undefined);
+    // If not found, skip
+    if (doseAndRate === undefined) return undefined;
+    // return property
+    return doseAndRate[key];
+}
+
+
+function $7cf24331c38efaf1$export$7de3722258b87db9({ config: config, dos: dos, i18next: i18next }) {
+    let doseQuantity = (0, $a8a8a2e7c5a5225c$export$76d408d587da5203)(dos, "doseQuantity");
     // If not found, skip
     if (doseQuantity === undefined) return undefined;
-    let quantity = doseQuantity.doseQuantity.value || 1;
+    let quantity = doseQuantity.value || 1;
     let unit = config.fromFHIRQuantityUnitToString({
         language: config.language,
-        quantity: doseQuantity.doseQuantity
+        quantity: doseQuantity
     });
     return i18next.t("fields.doseQuantity", {
         quantity: quantity,
@@ -106,16 +115,14 @@ function $73073500f7f08f16$export$be17d167ed50d870({ range: range, config: confi
 }
 
 
+
 function $465e6e43e1df9717$export$4cd16590995531a9({ dos: dos, config: config, i18next: i18next }) {
-    // If empty, return undefined
-    if (dos.doseAndRate === undefined) return undefined;
-    // Find the first entry that match criteria
-    let doseRange = dos.doseAndRate.find((s)=>s.doseRange !== undefined);
+    let doseRange = (0, $a8a8a2e7c5a5225c$export$76d408d587da5203)(dos, "doseRange");
     // If not found, skip
     if (doseRange === undefined) return undefined;
     // Turn range into a text
     const text = (0, $73073500f7f08f16$export$be17d167ed50d870)({
-        range: doseRange.doseRange,
+        range: doseRange,
         config: config,
         i18next: i18next
     });
@@ -127,20 +134,17 @@ function $465e6e43e1df9717$export$4cd16590995531a9({ dos: dos, config: config, i
 }
 
 
-// types
+
 function $bbbd1877a73b7a2b$export$4e24ef8c7997cc56({ dos: dos, config: config, i18next: i18next }) {
-    // If empty, return undefined
-    if (dos.doseAndRate === undefined) return undefined;
-    // Find the first entry that match criteria
-    let rateQuantity = dos.doseAndRate.find((s)=>s.rateQuantity !== undefined);
+    let rateQuantity = (0, $a8a8a2e7c5a5225c$export$76d408d587da5203)(dos, "rateQuantity");
     // If not found, skip
     if (rateQuantity === undefined) return undefined;
     // information from rate
-    let value = rateQuantity.rateQuantity.value || 1;
+    let value = rateQuantity.value || 1;
     // quantity unit
     let unit = config.fromFHIRQuantityUnitToString({
         language: config.language,
-        quantity: rateQuantity.rateQuantity
+        quantity: rateQuantity
     });
     return i18next.t("fields.rateQuantity", {
         quantity: value,
@@ -151,16 +155,14 @@ function $bbbd1877a73b7a2b$export$4e24ef8c7997cc56({ dos: dos, config: config, i
 
 // Utility function
 
+
 function $09db039855b6d015$export$d3dd7d3522271dba({ dos: dos, config: config, i18next: i18next }) {
-    // If empty, return undefined
-    if (dos.doseAndRate === undefined) return undefined;
-    // Find the first entry that match criteria
-    let doseAndRate = dos.doseAndRate.find((s)=>s.rateRange !== undefined);
+    let rateRange = (0, $a8a8a2e7c5a5225c$export$76d408d587da5203)(dos, "rateRange");
     // If not found, skip
-    if (doseAndRate === undefined) return undefined;
+    if (rateRange === undefined) return undefined;
     // Turn range into a text
     const rangeText = (0, $73073500f7f08f16$export$be17d167ed50d870)({
-        range: doseAndRate.rateRange,
+        range: rateRange,
         config: config,
         i18next: i18next
     });
@@ -218,18 +220,16 @@ function $eb371feb739abc89$export$fdc6e9cbd31555fb({ ratio: ratio, config: confi
 }
 
 
+
 function $520e93a43a731e9b$export$b71cfd2510242de2({ dos: dos, config: config, i18next: i18next }) {
-    // If empty, return undefined
-    if (dos.doseAndRate === undefined) return undefined;
-    // Find the first entry that match criteria
-    let doseAndRate = dos.doseAndRate.find((s)=>s.rateRatio !== undefined);
+    let rateRatio = (0, $a8a8a2e7c5a5225c$export$76d408d587da5203)(dos, "rateRatio");
     // If not found, skip
-    if (doseAndRate === undefined) return undefined;
+    if (rateRatio === undefined) return undefined;
     // Turn ratio to text
     const ratioText = (0, $eb371feb739abc89$export$fdc6e9cbd31555fb)({
         config: config,
         i18next: i18next,
-        ratio: doseAndRate.rateRatio
+        ratio: rateRatio
     });
     if (ratioText === undefined) return undefined;
     return i18next.t("fields.rateRatio", {
@@ -238,11 +238,18 @@ function $520e93a43a731e9b$export$b71cfd2510242de2({ dos: dos, config: config, i
 }
 
 
-function $9b80fa365533c8a7$export$675ae45fa2875f4a({ dos: dos, i18next: i18next }) {
+function $23009b94f0a4a8ee$export$1d3efc96e203aa6b(dos) {
     // If empty, return undefined
     if (dos.timing === undefined || dos.timing.repeat === undefined) return undefined;
+    return dos.timing.repeat;
+}
+
+
+function $9b80fa365533c8a7$export$675ae45fa2875f4a({ dos: dos, i18next: i18next }) {
+    let repeat = (0, $23009b94f0a4a8ee$export$1d3efc96e203aa6b)(dos);
+    // If empty, return undefined
+    if (repeat === undefined) return undefined;
     // Pickup the repeat interesting attributes
-    let repeat = dos.timing.repeat;
     let duration = repeat.duration;
     let max = repeat.durationMax;
     let unit = repeat.durationUnit;
@@ -265,11 +272,12 @@ function $9b80fa365533c8a7$export$675ae45fa2875f4a({ dos: dos, i18next: i18next
 }
 
 
+
 function $7e1bdc5bf5cdf5bd$export$d663412e0c469ce2({ dos: dos, i18next: i18next }) {
+    let repeat = (0, $23009b94f0a4a8ee$export$1d3efc96e203aa6b)(dos);
     // If empty, return undefined
-    if (dos.timing === undefined || dos.timing.repeat === undefined) return undefined;
+    if (repeat === undefined) return undefined;
     // Pickup the repeat interesting attributes
-    let repeat = dos.timing.repeat;
     let frequency = repeat.frequency;
     let max = repeat.frequencyMax;
     // Do nothing if no frequency / frequencyMax, I am not a wizard
@@ -293,11 +301,12 @@ function $7e1bdc5bf5cdf5bd$export$d663412e0c469ce2({ dos: dos, i18next: i18next
 }
 
 
+
 function $fcc6c325de921010$export$aa31b783699f637({ dos: dos, i18next: i18next }) {
+    let repeat = (0, $23009b94f0a4a8ee$export$1d3efc96e203aa6b)(dos);
     // If empty, return undefined
-    if (dos.timing === undefined || dos.timing.repeat === undefined) return undefined;
+    if (repeat === undefined) return undefined;
     // Pickup the repeat interesting attributes
-    let repeat = dos.timing.repeat;
     let period = repeat.period;
     let max = repeat.periodMax;
     let unit = repeat.periodUnit;
@@ -348,6 +357,7 @@ function $f475af73bad0ba43$export$826742c1df3eca39(i18next, arr, linkWord = "and
 }
 
 
+
 // Function to extract times
 function $f88800def2ddd9e9$var$extractTime(minutes) {
     let days = Math.floor(minutes / 1440);
@@ -391,10 +401,10 @@ function $f88800def2ddd9e9$var$transformWhen(i18next, when) {
     return finalString;
 }
 function $f88800def2ddd9e9$export$433fa514f44031f3({ dos: dos, i18next: i18next }) {
+    let repeat = (0, $23009b94f0a4a8ee$export$1d3efc96e203aa6b)(dos);
     // If empty, return undefined
-    if (dos.timing === undefined || dos.timing.repeat === undefined) return undefined;
+    if (repeat === undefined) return undefined;
     // Pickup the repeat interesting attributes
-    let repeat = dos.timing.repeat;
     let offset = repeat.offset;
     let when = repeat.when;
     // If both are undefined, don't do anything
@@ -410,11 +420,12 @@ function $f88800def2ddd9e9$export$433fa514f44031f3({ dos: dos, i18next: i18next
 
 // Function
 
+
 function $80e4a0390d11feb3$export$f6325e43097e9543({ dos: dos, i18next: i18next }) {
+    let repeat = (0, $23009b94f0a4a8ee$export$1d3efc96e203aa6b)(dos);
     // If empty, return undefined
-    if (dos.timing === undefined || dos.timing.repeat === undefined) return undefined;
+    if (repeat === undefined) return undefined;
     // Pickup the repeat interesting attributes
-    let repeat = dos.timing.repeat;
     let dayOfWeek = repeat.dayOfWeek;
     // If empty, skip it
     if (dayOfWeek === undefined || dayOfWeek.length === 0) return undefined;
@@ -432,6 +443,7 @@ function $80e4a0390d11feb3$export$f6325e43097e9543({ dos: dos, i18next: i18next
 
 // Functions
 
+
 /**
  * time during the day, in the format hh:mm:ss (a subset of [ISO8601] icon).
  * There is no date specified. Seconds must be provided due to schema type constraints but may be zero-filled
@@ -445,10 +457,10 @@ function $80e4a0390d11feb3$export$f6325e43097e9543({ dos: dos, i18next: i18next
     return parts.join(":");
 }
 function $a1b58a85293e76cc$export$ee205fa48981886d({ dos: dos, i18next: i18next }) {
+    let repeat = (0, $23009b94f0a4a8ee$export$1d3efc96e203aa6b)(dos);
     // If empty, return undefined
-    if (dos.timing === undefined || dos.timing.repeat === undefined) return undefined;
+    if (repeat === undefined) return undefined;
     // Pickup the repeat interesting attributes
-    let repeat = dos.timing.repeat;
     let timeOfDay = repeat.timeOfDay;
     // If empty, skip it
     if (timeOfDay === undefined || timeOfDay.length === 0) return undefined;
@@ -496,7 +508,8 @@ function $ab507771e2827c53$export$5c69a2202525487a({ dos: dos, config: config, i
 }
 
 
-// types
+// Functions
+
 // Duration to string
 function $ac69a26e361175ba$var$transformDurationToString(i18next, duration, config) {
     let quantity = duration.value;
@@ -516,10 +529,10 @@ function $ac69a26e361175ba$var$transformDurationToString(i18next, duration, conf
     }
 }
 function $ac69a26e361175ba$export$b927a06bc51aea32({ dos: dos, config: config, i18next: i18next }) {
+    let repeat = (0, $23009b94f0a4a8ee$export$1d3efc96e203aa6b)(dos);
     // If empty, return undefined
-    if (dos.timing === undefined || dos.timing.repeat === undefined) return undefined;
+    if (repeat === undefined) return undefined;
     // Pickup the repeat interesting attributes
-    let repeat = dos.timing.repeat;
     let boundsDuration = repeat.boundsDuration;
     // Do nothing if no boundsDuration, I am not a wizard
     if (boundsDuration === undefined) return undefined;
@@ -534,11 +547,12 @@ function $ac69a26e361175ba$export$b927a06bc51aea32({ dos: dos, config: config, i
 
 // types
 
+
 function $6b27b297c2af1001$export$8c667cbf7bebaa93({ dos: dos, config: config, i18next: i18next }) {
+    let repeat = (0, $23009b94f0a4a8ee$export$1d3efc96e203aa6b)(dos);
     // If empty, return undefined
-    if (dos.timing === undefined || dos.timing.repeat === undefined) return undefined;
+    if (repeat === undefined) return undefined;
     // Pickup the repeat interesting attributes
-    let repeat = dos.timing.repeat;
     let boundsRange = repeat.boundsRange;
     // Do nothing if no boundsRange, I am not a wizard
     if (boundsRange === undefined) return undefined;
@@ -559,11 +573,12 @@ function $6b27b297c2af1001$export$8c667cbf7bebaa93({ dos: dos, config: config, i
 }
 
 
+
 function $73a945b97fd1a22f$export$498ca7f558a02e67({ dos: dos, i18next: i18next }) {
+    let repeat = (0, $23009b94f0a4a8ee$export$1d3efc96e203aa6b)(dos);
     // If empty, return undefined
-    if (dos.timing === undefined || dos.timing.repeat === undefined) return undefined;
+    if (repeat === undefined) return undefined;
     // Pickup the repeat interesting attributes
-    let repeat = dos.timing.repeat;
     let count = repeat.count;
     let countMax = repeat.countMax;
     // Do nothing if no count, I am not a wizard
@@ -869,8 +884,6 @@ function $9b1af2fba509609e$export$9f330b4bf8c0975c({ entry: entry, ...args }) {
 
 
 
-// backends i18next
-const $8435b8d847fb3eb7$var$localeImport = async (lng, ns)=>import(`./locales/${lng}/${ns}.json`);
 class $8435b8d847fb3eb7$export$1c191bca55f84a03 {
     // Set up lib, according provided parameters
     constructor(args){
@@ -933,7 +946,7 @@ class $8435b8d847fb3eb7$export$1c191bca55f84a03 {
             backend: {
                 backends: [
                     (0, $hgUW1$i18nextresourcestobackend)(// have to cast the function to be webpack / builder friendly
-                    $8435b8d847fb3eb7$var$localeImport)
+                    async (lng, ns)=>import(`./locales/${lng}/${ns}.json`))
                 ]
             }
         });
@@ -1020,9 +1033,8 @@ class $8435b8d847fb3eb7$export$1c191bca55f84a03 {
         return this.getFields(dos, ...order);
     }
     /**
-   * Turn multiple FHIR Dosage object into text
-   */ fromMultipleDosageToText(dosages) {
-        // As we can have concurrent / sequential instructions, we need a generic algorithm to do the job
+   * Does this array of Dosage objects contains only "sequential" instructions ?
+   */ containsOnlySequentialInstructions(dosages) {
         // 1. Collect all sequences number
         let sequencesNumbers = dosages.map((d)=>d.sequence).filter((s)=>s !== undefined);
         // 2. Convert it to a Set
@@ -1030,11 +1042,13 @@ class $8435b8d847fb3eb7$export$1c191bca55f84a03 {
         // 3. We have a "sequential" situation in two cases
         // A) No sequence number were provided
         // B) All sequence numbers are different
-        if (encounteredSequenceNumbers.size === 0 || encounteredSequenceNumbers.size === dosages.length) {
-            const dosagesAsText = dosages.map((d)=>this.fromDosageToText(d));
-            return (0, $f475af73bad0ba43$export$826742c1df3eca39)(this.i18nInstance, dosagesAsText, "then");
-        }
-        // 4. We have both "sequential" and "concurrent" instructions - time to see what is the configuration
+        return encounteredSequenceNumbers.size === 0 || encounteredSequenceNumbers.size === dosages.length;
+    }
+    /**
+   * Turn this array of Dosage objects into a data structure useful to handle "sequential" and "concurrent" instructions (cf. "sequence" property).
+   * @returns {Dosage[][]} - A two-dimensional array where each inner array contains Dosage objects belonging to the same sequence numberr.
+   */ groupBySequence(dosages) {
+        // Prepare variables
         let groups = {};
         let sequences = new Set();
         for(let idx = 0; idx < dosages.length; idx++){
@@ -1043,23 +1057,39 @@ class $8435b8d847fb3eb7$export$1c191bca55f84a03 {
             // Get the sequence number (normally, in real world, it should be present in this case)
             // If no sequence number, assume it is idx + 1
             let sequenceNr = dosage.sequence || idx + 1;
-            // Generate the text version
-            let dosageAsText = this.fromDosageToText(dosage);
             // Retrieve of create previous entries for this sequence number
             let localGroup = groups[sequenceNr] || [];
             // Add entry
-            localGroup.push(dosageAsText);
+            localGroup.push(dosage);
             // Pushback result
             groups[sequenceNr] = localGroup;
             // For reminder of the parsed sequence
             sequences.add(sequenceNr);
         }
-        // 5. Now that data structures are filled, it is a piece of cake to generate the result
-        let sequentialInstructions = [
+        // By using the Set values, we are sure it is returned in the way Dosages were written
+        return [
             ...sequences.values()
         ].map((sequence)=>{
             let concurrentInstructions = groups[sequence];
-            return (0, $f475af73bad0ba43$export$826742c1df3eca39)(this.i18nInstance, concurrentInstructions, "and");
+            return concurrentInstructions;
+        });
+    }
+    /**
+   * 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
+        const hasOnlySequentialInstructions = this.containsOnlySequentialInstructions(dosages);
+        // Sequential instructions
+        if (hasOnlySequentialInstructions) {
+            const dosagesAsText = dosages.map((d)=>this.fromDosageToText(d));
+            return (0, $f475af73bad0ba43$export$826742c1df3eca39)(this.i18nInstance, dosagesAsText, "then");
+        }
+        // We have both "sequential" and "concurrent" instructions - time to see what is the configuration
+        let sortedDosages = this.groupBySequence(dosages);
+        // Now that data structures are filled, it is a piece of cake to generate the result
+        let sequentialInstructions = sortedDosages.map((concurrentInstructions)=>{
+            let concurrentInstructionsAsString = concurrentInstructions.map((dosage)=>this.fromDosageToText(dosage));
+            return (0, $f475af73bad0ba43$export$826742c1df3eca39)(this.i18nInstance, concurrentInstructionsAsString, "and");
         });
         return (0, $f475af73bad0ba43$export$826742c1df3eca39)(this.i18nInstance, sequentialInstructions, "then");
     }