fhir-dosage-utils 1.9.0 → 1.10.0

package/dist/main.js

@@ -29,22 +29,30 @@ function $1c57f108974f2805$export$b1a6aed91fad1636({ quantity: quantity }) {
 }
 
 
+// Functions
+function $7642ff4865ae4b0f$export$d9ff4a623e416a11(array) {
+    return array === undefined || array.length === 0;
+}
+
+
 function $a6c648898dc8c3b6$export$f478f96b98da13a4({ code: code }) {
     // If no code, skip it
     if (code === undefined) return undefined;
     // Take text first
     if (code.text !== undefined) return code.text;
     // If empty, skip it
-    if (code.coding === undefined || code.coding.length === 0) return undefined;
+    if ((0, $7642ff4865ae4b0f$export$d9ff4a623e416a11)(code.coding)) return undefined;
     // Take first coding; display first then code
     let firstCode = code.coding[0];
     return firstCode.display || firstCode.code;
 }
 
 
+// Functions
+
 function $34ebae8ac5b52fcd$export$30c337e25ab8e95b({ extensions: extensions }) {
     // If no extensions, skip it
-    if (extensions === undefined || extensions.length === 0) return undefined;
+    if ((0, $7642ff4865ae4b0f$export$d9ff4a623e416a11)(extensions)) return undefined;
     // KIS implementation : print it as provided, without doing anything
     // Extensions have so many cases btw, that having a basic function does the trick
     return extensions.map((extension)=>JSON.stringify(extension)).join(" ");
@@ -107,7 +115,8 @@ class $868b4eaa4f62b9f7$export$f807d9a22ff8372d {
                 "common",
                 "daysOfWeek",
                 "eventTiming",
-                "unitsOfTime"
+                "unitsOfTime",
+                "quantityComparator"
             ],
             defaultNS: "common",
             // attributes set by user
@@ -206,13 +215,19 @@ function $6ce94eb09701f53d$export$e9106be159f8c977({ quantity: quantity, config:
     });
     let value = quantity.value || 1;
     // If no unit is present (in other words ""), we don't put it
-    if (unit.length === 0) return i18next.t("amount.quantity.withoutUnit", {
+    let quantityString = unit.length === 0 ? i18next.t("amount.quantity.withoutUnit", {
         quantity: value
-    });
-    else return i18next.t("amount.quantity.withUnit", {
+    }) : i18next.t("amount.quantity.withUnit", {
         quantity: value,
         unit: unit
     });
+    // Compute the comparator
+    let comparatorCode = quantity.comparator;
+    let comparatorString = comparatorCode !== undefined ? i18next.t(`quantityComparator:${comparatorCode}`) : undefined;
+    // If no comparator, print it
+    if (comparatorString === undefined) return quantityString;
+    else // concatenate comparator and quantity
+    return `${comparatorString} ${quantityString}`;
 }
 
 
@@ -241,7 +256,8 @@ function $9ee880701f47723b$var$transformQuantityUnitToString(i18next, quantity,
         return i18next.t(`unitsOfTime:withoutCount.${code}`, {
             count: quantityValue
         });
-    } else // otherwise, it is UCUM, ... so let the user do the job
+    }
+    // otherwise, it is UCUM, ... so let the user do the job
     return config.fromFHIRQuantityUnitToString({
         language: config.language,
         quantity: quantity
@@ -339,50 +355,68 @@ function $703b645b55481398$export$d3dd7d3522271dba({ dos: dos, config: config, i
 }
 
 
+// Functions
+
 // Quantity has an unit ?
 function $7895e9944cc835ce$var$hasUnit(quantity) {
-    return (quantity?.unit || quantity?.code) !== undefined;
+    return [
+        quantity?.unit,
+        quantity?.code
+    ].some((field)=>field !== undefined);
+}
+// To cover all nasty cases of denominator
+function $7895e9944cc835ce$var$fromDenominatorToString({ config: config, i18next: i18next, quantity: quantity }) {
+    let hasUnitDenominator = $7895e9944cc835ce$var$hasUnit(quantity);
+    let value = quantity.value;
+    // If no unit, it is quite simple
+    if (!hasUnitDenominator) return `:${value}`;
+    // Get correct linkword (depending of the quantity value)
+    let linkword = i18next.t("amount.ratio.denominatorLinkword", {
+        count: value
+    });
+    // Get quantity text (depending of the quantity value)
+    let quantityText = value !== 1 ? (0, $6ce94eb09701f53d$export$e9106be159f8c977)({
+        quantity: quantity,
+        config: config,
+        i18next: i18next
+    }) : config.fromFHIRQuantityUnitToString({
+        quantity: quantity,
+        language: config.language
+    });
+    // Concatenate all computed parts
+    // The space before is intentional so that numerator and denominator are well printed regardless of situation
+    return ` ${linkword} ${quantityText}`;
 }
 function $7895e9944cc835ce$export$fdc6e9cbd31555fb({ ratio: ratio, config: config, i18next: i18next }) {
     // Extract params
     const { denominator: denominator, numerator: numerator } = ratio;
-    // units as text
-    let numeratorUnit = $7895e9944cc835ce$var$hasUnit(numerator) ? config.fromFHIRQuantityUnitToString({
-        language: config.language,
-        quantity: numerator
-    }) : undefined;
-    let denominatorUnit = $7895e9944cc835ce$var$hasUnit(denominator) ? config.fromFHIRQuantityUnitToString({
-        language: config.language,
-        quantity: denominator
-    }) : undefined;
     // quantity
     let quantityNumerator = numerator?.value;
     let quantityDenominator = denominator?.value;
     // 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";
-        const numeratorString = i18next.t(`amount.ratio.${technicalKey}.numerator`, {
-            count: quantityNumerator,
-            numeratorUnit: numeratorUnit
+        // Reuse the quantity to string translation
+        const numeratorString = (0, $6ce94eb09701f53d$export$e9106be159f8c977)({
+            quantity: numerator,
+            config: config,
+            i18next: i18next
         });
         parts.push(numeratorString);
     }
     // Deal with denominator
     if (quantityDenominator !== undefined) {
-        let technicalKey = denominatorUnit !== undefined ? "withUnit" : "withoutUnit";
-        const denominatorString = i18next.t(`amount.ratio.${technicalKey}.denominator`, {
-            count: quantityDenominator,
-            denominatorUnit: denominatorUnit
+        // Several cases exist for that, let use a proper function for that
+        const denominatorString = $7895e9944cc835ce$var$fromDenominatorToString({
+            config: config,
+            i18next: i18next,
+            quantity: denominator
         });
         parts.push(denominatorString);
     }
     // Concatenate the result
-    if (parts.length === 0) return undefined;
-    else return parts.join(separator);
+    return parts.length > 0 ? parts.join("") : undefined;
 }
 
 
@@ -406,7 +440,7 @@ function $301791f33da707fa$export$b71cfd2510242de2({ dos: dos, config: config, i
 
 function $e8251a88ed398f12$export$1d3efc96e203aa6b(dos) {
     // If empty, return undefined
-    if (dos.timing === undefined || dos.timing.repeat === undefined) return undefined;
+    if (dos.timing?.repeat === undefined) return undefined;
     return dos.timing.repeat;
 }
 
@@ -421,7 +455,7 @@ function $1270a8f06113f53a$export$675ae45fa2875f4a({ dos: dos, i18next: i18next
     let unit = repeat.durationUnit;
     // Do nothing if no unit, I am not a wizard
     if (unit === undefined) return undefined;
-    else return [
+    return [
         // duration
         duration !== undefined && i18next.t("fields.duration", {
             durationText: i18next.t(`unitsOfTime:withCount.${unit}`, {
@@ -448,22 +482,20 @@ function $bc43734b944260d2$export$d663412e0c469ce2({ dos: dos, i18next: i18next
     let max = repeat.frequencyMax;
     // Do nothing if no frequency / frequencyMax, I am not a wizard
     if (frequency === undefined && max === undefined) return undefined;
-    else {
-        // Three cases
-        // 1. Frequency and frequencyMax are present
-        if (frequency !== undefined && max !== undefined) return i18next.t("fields.frequency.withfrequencyMax", {
-            count: max,
-            frequency: frequency
-        });
-        // 2. Only frequencyMax is present
-        if (max !== undefined) return i18next.t("fields.frequencyMax.frequencyMax", {
-            count: max
-        });
-        // 3. Only frequency is present
-        return i18next.t("fields.frequency.onlyFrequency", {
-            count: frequency
-        });
-    }
+    // Three cases
+    // 1. Frequency and frequencyMax are present
+    if (frequency !== undefined && max !== undefined) return i18next.t("fields.frequency.withfrequencyMax", {
+        count: max,
+        frequency: frequency
+    });
+    // 2. Only frequencyMax is present
+    if (max !== undefined) return i18next.t("fields.frequencyMax.frequencyMax", {
+        count: max
+    });
+    // 3. Only frequency is present
+    return i18next.t("fields.frequency.onlyFrequency", {
+        count: frequency
+    });
 }
 
 
@@ -478,31 +510,29 @@ function $b9825dd9e0a2e687$export$aa31b783699f637({ dos: dos, i18next: i18next }
     let unit = repeat.periodUnit;
     // Do nothing if no unit, I am not a wizard
     if (unit === undefined) return undefined;
-    else {
-        // Three cases
-        // 1. period and periodMax are present
-        if (period !== undefined && max !== undefined) return i18next.t("fields.periodMax.withPeriod", {
-            period: period,
-            count: max,
-            unit: i18next.t(`unitsOfTime:withoutCount.${unit}`, {
-                count: max
-            })
-        });
-        // 2. Only periodMax is present
-        if (max !== undefined) return i18next.t("fields.periodMax.onlyPeriodMax", {
-            count: max,
-            unit: i18next.t(`unitsOfTime:withoutCount.${unit}`, {
-                count: max
-            })
-        });
-        // 3. Only period present
-        return i18next.t("fields.period.period", {
-            count: period,
-            unit: i18next.t(`unitsOfTime:withoutCount.${unit}`, {
-                count: period
-            })
-        });
-    }
+    // Three cases
+    // 1. period and periodMax are present
+    if (period !== undefined && max !== undefined) return i18next.t("fields.periodMax.withPeriod", {
+        period: period,
+        count: max,
+        unit: i18next.t(`unitsOfTime:withoutCount.${unit}`, {
+            count: max
+        })
+    });
+    // 2. Only periodMax is present
+    if (max !== undefined) return i18next.t("fields.periodMax.onlyPeriodMax", {
+        count: max,
+        unit: i18next.t(`unitsOfTime:withoutCount.${unit}`, {
+            count: max
+        })
+    });
+    // 3. Only period present
+    return i18next.t("fields.period.period", {
+        count: period,
+        unit: i18next.t(`unitsOfTime:withoutCount.${unit}`, {
+            count: period
+        })
+    });
 }
 
 
@@ -524,6 +554,7 @@ function $93b58b7d2ead3b95$export$826742c1df3eca39(i18next, arr, linkWord = "and
 
 
 
+
 // Function to extract times
 function $7a065f861a4b61f2$var$extractTime(minutes) {
     let days = Math.floor(minutes / 1440);
@@ -560,11 +591,10 @@ function $7a065f861a4b61f2$var$transformOffset(i18next, offset) {
 // Function to transform when[] into a string
 function $7a065f861a4b61f2$var$transformWhen(i18next, when) {
     // Only run when array is not empty
-    if (when === undefined || when.length === 0) return undefined;
+    if ((0, $7642ff4865ae4b0f$export$d9ff4a623e416a11)(when)) return undefined;
     // Turn it into a string
     const whens = when.map((whenCode)=>i18next.t(`eventTiming:${whenCode}`));
-    const finalString = (0, $93b58b7d2ead3b95$export$826742c1df3eca39)(i18next, whens);
-    return finalString;
+    return (0, $93b58b7d2ead3b95$export$826742c1df3eca39)(i18next, whens);
 }
 function $7a065f861a4b61f2$export$433fa514f44031f3({ dos: dos, i18next: i18next }) {
     let repeat = (0, $e8251a88ed398f12$export$1d3efc96e203aa6b)(dos);
@@ -587,6 +617,7 @@ function $7a065f861a4b61f2$export$433fa514f44031f3({ dos: dos, i18next: i18next
 // Function
 
 
+
 function $46f2142e76cf7e45$export$f6325e43097e9543({ dos: dos, i18next: i18next }) {
     let repeat = (0, $e8251a88ed398f12$export$1d3efc96e203aa6b)(dos);
     // If empty, return undefined
@@ -594,22 +625,21 @@ function $46f2142e76cf7e45$export$f6325e43097e9543({ dos: dos, i18next: i18next
     // Pickup the repeat interesting attributes
     let dayOfWeek = repeat.dayOfWeek;
     // If empty, skip it
-    if (dayOfWeek === undefined || dayOfWeek.length === 0) return undefined;
-    else {
-        // Turn it into a string
-        const dayOfWeeks = dayOfWeek.map((dayCode)=>i18next.t(`daysOfWeek:${dayCode}`));
-        const dayOfWeeksAsString = (0, $93b58b7d2ead3b95$export$826742c1df3eca39)(i18next, dayOfWeeks);
-        return i18next.t("fields.dayOfWeek.dayOfWeek", {
-            count: dayOfWeek.length,
-            dayOfWeek: dayOfWeeksAsString
-        });
-    }
+    if ((0, $7642ff4865ae4b0f$export$d9ff4a623e416a11)(dayOfWeek)) return undefined;
+    // Turn it into a string
+    const dayOfWeeks = dayOfWeek.map((dayCode)=>i18next.t(`daysOfWeek:${dayCode}`));
+    const dayOfWeeksAsString = (0, $93b58b7d2ead3b95$export$826742c1df3eca39)(i18next, dayOfWeeks);
+    return i18next.t("fields.dayOfWeek.dayOfWeek", {
+        count: dayOfWeek.length,
+        dayOfWeek: dayOfWeeksAsString
+    });
 }
 
 
 // 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
@@ -629,16 +659,14 @@ function $a846209a7dd119d4$export$ee205fa48981886d({ dos: dos, i18next: i18next
     // Pickup the repeat interesting attributes
     let timeOfDay = repeat.timeOfDay;
     // If empty, skip it
-    if (timeOfDay === undefined || timeOfDay.length === 0) return undefined;
-    else {
-        // Turn it into a string
-        const timeOfDays = timeOfDay.map($a846209a7dd119d4$var$formatString);
-        const timeOfDaysAsString = (0, $93b58b7d2ead3b95$export$826742c1df3eca39)(i18next, timeOfDays);
-        return i18next.t("fields.timeOfDay", {
-            timeOfDay: timeOfDaysAsString,
-            count: timeOfDays.length
-        });
-    }
+    if ((0, $7642ff4865ae4b0f$export$d9ff4a623e416a11)(timeOfDay)) return undefined;
+    // Turn it into a string
+    const timeOfDays = timeOfDay.map($a846209a7dd119d4$var$formatString);
+    const timeOfDaysAsString = (0, $93b58b7d2ead3b95$export$826742c1df3eca39)(i18next, timeOfDays);
+    return i18next.t("fields.timeOfDay", {
+        timeOfDay: timeOfDaysAsString,
+        count: timeOfDays.length
+    });
 }
 
 
@@ -665,12 +693,12 @@ function $ee04e2a8ed39962f$export$5c69a2202525487a({ dos: dos, config: config, i
     if (codeableList.length > 0) return i18next.t("fields.asNeededFor", {
         reasons: $ee04e2a8ed39962f$var$fromCodeableConceptArrayToString(i18next, codeableList, config)
     });
-    else {
-        // merge boolean to make it simpler
-        let booleanValue = asNeededBoolean || asNeeded || false;
-        if (booleanValue) return i18next.t("fields.asNeeded");
-        else return undefined;
-    }
+    // merge boolean to make it simpler
+    let booleanValue = [
+        asNeededBoolean,
+        asNeeded
+    ].includes(true);
+    return booleanValue ? i18next.t("fields.asNeeded") : undefined;
 }
 
 
@@ -702,12 +730,10 @@ function $9d632517596957df$export$b927a06bc51aea32({ dos: dos, config: config, i
     let boundsDuration = repeat.boundsDuration;
     // Do nothing if no boundsDuration, I am not a wizard
     if (boundsDuration === undefined) return undefined;
-    else {
-        let durationText = $9d632517596957df$var$transformDurationToString(i18next, boundsDuration, config);
-        return i18next.t("fields.boundsDuration", {
-            durationText: durationText
-        });
-    }
+    let durationText = $9d632517596957df$var$transformDurationToString(i18next, boundsDuration, config);
+    return i18next.t("fields.boundsDuration", {
+        durationText: durationText
+    });
 }
 
 
@@ -722,20 +748,18 @@ function $2da391a8a8345a3d$export$8c667cbf7bebaa93({ dos: dos, config: config, i
     let boundsRange = repeat.boundsRange;
     // Do nothing if no boundsRange, I am not a wizard
     if (boundsRange === undefined) return undefined;
-    else {
-        // Turn range into a text
-        const rangeText = (0, $9ee880701f47723b$export$be17d167ed50d870)({
-            range: boundsRange,
-            config: config,
-            i18next: i18next
-        });
-        // Reject if empty
-        if (rangeText === undefined) return undefined;
-        // return the final string
-        return i18next.t("fields.boundsRange", {
-            rangeText: rangeText
-        });
-    }
+    // Turn range into a text
+    const rangeText = (0, $9ee880701f47723b$export$be17d167ed50d870)({
+        range: boundsRange,
+        config: config,
+        i18next: i18next
+    });
+    // Reject if empty
+    if (rangeText === undefined) return undefined;
+    // return the final string
+    return i18next.t("fields.boundsRange", {
+        rangeText: rangeText
+    });
 }
 
 
@@ -749,22 +773,20 @@ function $39470eb799331038$export$498ca7f558a02e67({ dos: dos, i18next: i18next
     let countMax = repeat.countMax;
     // Do nothing if no count, I am not a wizard
     if (count === undefined && countMax === undefined) return undefined;
-    else {
-        // Three cases
-        // 1. Both count & countMax are present
-        if (count !== undefined && countMax !== undefined) return i18next.t("fields.countMax.countMax", {
-            count: countMax,
-            low: count
-        });
-        // 2. Only countMax is present
-        if (countMax !== undefined) return i18next.t("fields.count.count", {
-            count: countMax
-        });
-        // 3. Only count is present
-        return i18next.t("fields.count.count", {
-            count: count
-        });
-    }
+    // Three cases
+    // 1. Both count & countMax are present
+    if (count !== undefined && countMax !== undefined) return i18next.t("fields.countMax.countMax", {
+        count: countMax,
+        low: count
+    });
+    // 2. Only countMax is present
+    if (countMax !== undefined) return i18next.t("fields.count.count", {
+        count: countMax
+    });
+    // 3. Only count is present
+    return i18next.t("fields.count.count", {
+        count: count
+    });
 }
 
 
@@ -775,19 +797,32 @@ function $39470eb799331038$export$498ca7f558a02e67({ dos: dos, i18next: i18next
 // Note: dateStyle and timeStyle can be used with each other,
 // but not with other date-time component options (e.g. weekday, hour, month, etc.).
 function $208be5279f5e6c65$var$generateDateStyleFormatOptions(options) {
+    if (options.dateStyle !== undefined) return {
+        dateStyle: options.dateStyle
+    };
+    const defaults = {
+        year: "numeric",
+        month: "2-digit",
+        day: "2-digit"
+    };
     return {
-        year: options.dateStyle === undefined ? options.year || "numeric" : undefined,
-        month: options.dateStyle === undefined ? options.month || "2-digit" : undefined,
-        day: options.dateStyle === undefined ? options.day || "2-digit" : undefined,
-        weekday: options.dateStyle === undefined ? options.weekday : undefined
+        ...options,
+        ...defaults
     };
 }
 // Function to clean up the params for timeStyle situation
 function $208be5279f5e6c65$var$generateTimeStyleFormatOptions(options) {
+    if (options.timeStyle !== undefined) return {
+        timeStyle: options.timeStyle
+    };
+    const defaults = {
+        hour: "2-digit",
+        minute: "2-digit",
+        second: "2-digit"
+    };
     return {
-        hour: options.timeStyle === undefined ? options.hour || "2-digit" : undefined,
-        minute: options.timeStyle === undefined ? options.minute || "2-digit" : undefined,
-        second: options.timeStyle === undefined ? options.second || "2-digit" : undefined
+        ...options,
+        ...defaults
     };
 }
 function $208be5279f5e6c65$export$a77f8869772ffca4({ config: config, datetimes: datetimes }) {
@@ -829,8 +864,7 @@ function $208be5279f5e6c65$export$a77f8869772ffca4({ config: config, datetimes:
         if (!hasTimePart) {
             let df3 = new Intl.DateTimeFormat(config.language, {
                 // retrieve value from user
-                dateStyle: options.dateStyle,
-                // fallback if dateStyle is not defined
+                // and fallback if dateStyle is not defined
                 ...$208be5279f5e6c65$var$generateDateStyleFormatOptions(options)
             });
             return df3.format(date);
@@ -838,9 +872,7 @@ function $208be5279f5e6c65$export$a77f8869772ffca4({ config: config, datetimes:
         // Otherwise, we have a full datetime
         let df4 = new Intl.DateTimeFormat(config.language, {
             // retrieve value from user
-            dateStyle: options.dateStyle,
-            timeStyle: options.timeStyle,
-            // fallback if dateStyle / timeStyle is not defined
+            // and fallback if dateStyle / timeStyle is not defined
             ...$208be5279f5e6c65$var$generateDateStyleFormatOptions(options),
             ...$208be5279f5e6c65$var$generateTimeStyleFormatOptions(options)
         });
@@ -862,11 +894,11 @@ function $208be5279f5e6c65$export$4699e913d5b6ffeb({ config: config, datetime: d
 }
 
 
+
 function $3bceb6a4d7bec96e$export$3c2848bc0f0e3783({ dos: dos, config: config, i18next: i18next }) {
     // If empty, return undefined
-    if (dos.timing === undefined || dos.timing.event === undefined || dos.timing.event.length === 0) return undefined;
-    // Generate the string version of them
-    let events = dos.timing.event;
+    let events = dos.timing?.event;
+    if ((0, $7642ff4865ae4b0f$export$d9ff4a623e416a11)(events)) return undefined;
     // List to string
     let eventList = (0, $208be5279f5e6c65$export$a77f8869772ffca4)({
         config: config,
@@ -882,9 +914,10 @@ function $3bceb6a4d7bec96e$export$3c2848bc0f0e3783({ dos: dos, config: config, i
 
 // Function
 
+
 function $6c156f35df44ca41$export$21e3522d6e713036({ dos: dos, config: config, i18next: i18next }) {
     // If empty, return undefined
-    if (dos.additionalInstruction === undefined || dos.additionalInstruction.length === 0) return undefined;
+    if ((0, $7642ff4865ae4b0f$export$d9ff4a623e416a11)(dos.additionalInstruction)) return undefined;
     // Turn it into strings
     let additionalInstructions = dos.additionalInstruction.map((instruction)=>config.fromCodeableConceptToString({
             code: instruction,
@@ -930,7 +963,7 @@ function $9ad44f2c84a9bdf4$export$58c8a9e040283a66({ dos: dos, config: config, i
 
 function $45256d2a188dcbd7$export$75a89431d80a701a({ dos: dos, config: config, i18next: i18next }) {
     // If empty, return undefined
-    if (dos.timing === undefined || dos.timing.repeat === undefined || dos.timing.repeat.boundsPeriod === undefined) return undefined;
+    if (dos.timing?.repeat?.boundsPeriod === undefined) return undefined;
     // Generate the string version of them
     const boundsPeriod = dos.timing.repeat.boundsPeriod;
     let start = (0, $208be5279f5e6c65$export$4699e913d5b6ffeb)({