fhir-dosage-utils 1.10.4 → 2.0.0

package/README.md

@@ -31,3 +31,7 @@ Special thanks to [NHS England](https://digital.nhs.uk/), the author of `Impleme
 <a href="https://github.com/jy95/fhir-dosage-utils/graphs/contributors">
   <img src="https://contrib.rocks/image?repo=jy95/fhir-dosage-utils" />
 </a>
+
+## Star History
+
+[![Star History Chart](https://api.star-history.com/svg?repos=jy95/fhir-dosage-utils&type=Date)](https://star-history.com/#jy95/fhir-dosage-utils&Date)

package/dist/main.js

@@ -1,12 +1,8 @@
-var $8zHUo$i18nextresourcestobackend = require("i18next-resources-to-backend");
 var $8zHUo$i18next = require("i18next");
 var $8zHUo$i18nextchainedbackend = require("i18next-chained-backend");
+var $8zHUo$i18nextresourcestobackend = require("i18next-resources-to-backend");
 
 
-function $parcel$defineInteropFlag(a) {
-  Object.defineProperty(a, '__esModule', {value: true, configurable: true});
-}
-
 function $parcel$export(e, n, v, s) {
   Object.defineProperty(e, n, {get: v, set: s, enumerable: true, configurable: true});
 }
@@ -15,9 +11,9 @@ function $parcel$interopDefault(a) {
   return a && a.__esModule ? a.default : a;
 }
 
-$parcel$defineInteropFlag(module.exports);
+$parcel$export(module.exports, "FhirDosageUtils", () => $74b0cf9d3dbd5b46$export$1c191bca55f84a03);
+// Export utility class
 
-$parcel$export(module.exports, "default", () => $882b6d93070905b3$export$2e2bcd8739ae039);
 
 
 function $3d60081b7152576d$export$e7321bf46d18757f(val) {
@@ -57,13 +53,11 @@ function $a6c648898dc8c3b6$export$f478f96b98da13a4({ code: code }) {
 
 function $34ebae8ac5b52fcd$export$30c337e25ab8e95b({ extensions: extensions }) {
     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(" ");
 }
 
 
-const $99ea7fa882fd33ad$export$38cd8db2db178f58 = {
+const $4a853aea29761dad$export$38cd8db2db178f58 = {
     language: "en",
     fromFHIRQuantityUnitToString: (0, $1c57f108974f2805$export$b1a6aed91fad1636),
     fromCodeableConceptToString: (0, $a6c648898dc8c3b6$export$f478f96b98da13a4),
@@ -96,90 +90,38 @@ const $99ea7fa882fd33ad$export$38cd8db2db178f58 = {
         "patientInstruction"
     ],
     displaySeparator: " - ",
-    dateTimeFormatOptions: {}
+    dateTimeFormatOptions: {},
+    i18nConfig: {
+        backend: {
+            backends: [
+                (0, ($parcel$interopDefault($8zHUo$i18nextresourcestobackend)))(async (lng, ns)=>import(`./locales/${lng}/${ns}.json`))
+            ]
+        }
+    }
 };
 
 
-class $868b4eaa4f62b9f7$export$f807d9a22ff8372d {
-    constructor(userConfig, i18nConfig){
-        this.config = {
-            ...(0, $99ea7fa882fd33ad$export$38cd8db2db178f58),
-            ...userConfig
-        };
-        this.i18nConfig = {
-            fallbackLng: "en",
-            lng: this.config.language,
-            ns: [
-                "common",
-                "daysOfWeek",
-                "eventTiming",
-                "unitsOfTime",
-                "quantityComparator"
-            ],
-            defaultNS: "common",
-            ...i18nConfig
-        };
-        this.i18nInstance = (0, ($parcel$interopDefault($8zHUo$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, ($parcel$interopDefault($8zHUo$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;
+
+class $4f322cc1dbc51a0e$export$d2ca453b913dcdea {
+    containsOnlySequentialInstructions(dosages) {
+        let sequencesNumbers = dosages.map((d)=>d.sequence).filter((0, $3d60081b7152576d$export$e7321bf46d18757f));
+        let encounteredSequenceNumbers = new Set(sequencesNumbers);
+        return [
+            0,
+            dosages.length
+        ].includes(encounteredSequenceNumbers.size);
     }
-    /**
-   * Set date time format options
-   */ changeDateTimeFormatOptions(opts) {
-        this.config = {
-            ...this.config,
-            dateTimeFormatOptions: opts
-        };
+    groupBySequence(dosages) {
+        let sequences = new Set();
+        let sequencesMap = new Map();
+        for (let dosage of dosages){
+            let sequenceNr = dosage.sequence;
+            let localGroup = sequencesMap.get(sequenceNr) ?? [];
+            localGroup.push(dosage);
+            sequencesMap.set(sequenceNr, localGroup);
+            sequences.add(sequenceNr);
+        }
+        return Array.from(sequences, (sequence)=>sequencesMap.get(sequence));
     }
 }
 
@@ -187,7 +129,6 @@ class $868b4eaa4f62b9f7$export$f807d9a22ff8372d {
 
 function $5461d5c8b4bc074f$export$76d408d587da5203(dos, key) {
     if (!(0, $3d60081b7152576d$export$e7321bf46d18757f)(dos.doseAndRate)) return undefined;
-    // Find the first entry that match criteria
     let doseAndRate = dos.doseAndRate.find((s)=>(0, $3d60081b7152576d$export$e7321bf46d18757f)(s[key]));
     if (!(0, $3d60081b7152576d$export$e7321bf46d18757f)(doseAndRate)) return undefined;
     return doseAndRate[key];
@@ -517,9 +458,9 @@ function $7a065f861a4b61f2$var$transformOffset(i18next, offset) {
         "h",
         "min"
     ];
-    return order.map((unit)=>time[unit] > 0 ? i18next.t(`unitsOfTime:withCount.${unit}`, {
+    return order.filter((unit)=>time[unit] > 0).map((unit)=>i18next.t(`unitsOfTime:withCount.${unit}`, {
             count: time[unit]
-        }) : undefined).filter((0, $3d60081b7152576d$export$e7321bf46d18757f)).join(" ");
+        })).join(" ");
 }
 function $7a065f861a4b61f2$var$transformWhen(i18next, when) {
     if ((0, $7642ff4865ae4b0f$export$d9ff4a623e416a11)(when)) return undefined;
@@ -847,20 +788,16 @@ function $39ffdeadc450f558$export$346b11a8cb220f02({ dos: dos, config: config, i
     if (!(0, $3d60081b7152576d$export$e7321bf46d18757f)(dos.maxDosePerPeriod)) return undefined;
     const maxDosePerPeriod = dos.maxDosePerPeriod;
     // In R4, it was a single object / In R5, it is an array
-    // So better to have a generic approach
     const values = Array.isArray(maxDosePerPeriod) ? maxDosePerPeriod : [
         maxDosePerPeriod
     ];
-    // Only consider not empty array
     if (values.length === 0) return undefined;
     // Periods are expressed as ratio (like rateRatio)
-    const valuesAsString = values.map((period)=>{
-        return (0, $7895e9944cc835ce$export$fdc6e9cbd31555fb)({
+    const valuesAsString = values.map((period)=>(0, $7895e9944cc835ce$export$fdc6e9cbd31555fb)({
             config: config,
             i18next: i18next,
             ratio: period
-        });
-    }).filter((0, $3d60081b7152576d$export$e7321bf46d18757f));
+        })).filter((0, $3d60081b7152576d$export$e7321bf46d18757f));
     const maxDosePerPeriodText = (0, $93b58b7d2ead3b95$export$826742c1df3eca39)(i18next, valuesAsString);
     return i18next.t("fields.maxDosePerPeriod", {
         count: values.length,
@@ -947,50 +884,46 @@ function $2c21ace90ecdbde6$export$9f330b4bf8c0975c({ entry: entry, ...args }) {
 
 
 
-
-const $74b0cf9d3dbd5b46$var$defaultI18NConfig = {
-    backend: {
-        backends: [
-            (0, ($parcel$interopDefault($8zHUo$i18nextresourcestobackend)))(async (lng, ns)=>import(`./locales/${lng}/${ns}.json`))
-        ]
+class $74b0cf9d3dbd5b46$export$1c191bca55f84a03 extends (0, $4f322cc1dbc51a0e$export$d2ca453b913dcdea) {
+    constructor(config){
+        super();
+        this.config = {
+            ...(0, $4a853aea29761dad$export$38cd8db2db178f58),
+            ...config
+        };
+        this.i18nInstance = (0, ($parcel$interopDefault($8zHUo$i18next))).createInstance();
     }
-};
-class $74b0cf9d3dbd5b46$export$1c191bca55f84a03 extends (0, $868b4eaa4f62b9f7$export$f807d9a22ff8372d) {
-    /**
-   * Factory to create a fine-tuned instance of the utility class
-   */ static async build(userConfig, i18nConfig = $74b0cf9d3dbd5b46$var$defaultI18NConfig) {
-        const instance = new $74b0cf9d3dbd5b46$export$1c191bca55f84a03(userConfig, i18nConfig);
+    async init() {
+        return await this.i18nInstance.use((0, ($parcel$interopDefault($8zHUo$i18nextchainedbackend)))).init({
+            fallbackLng: "en",
+            lng: this.config.language,
+            ns: [
+                "common",
+                "daysOfWeek",
+                "eventTiming",
+                "unitsOfTime",
+                "quantityComparator"
+            ],
+            defaultNS: "common",
+            ...this.config.i18nConfig
+        });
+    }
+    static async build(config = {}) {
+        const instance = new $74b0cf9d3dbd5b46$export$1c191bca55f84a03(config);
         await instance.init();
         return instance;
     }
-    /**
-   * Does this array of Dosage objects contains only "sequential" instructions ?
-   */ containsOnlySequentialInstructions(dosages) {
-        let sequencesNumbers = dosages.map((d)=>d.sequence).filter((0, $3d60081b7152576d$export$e7321bf46d18757f));
-        let encounteredSequenceNumbers = new Set(sequencesNumbers);
-        return encounteredSequenceNumbers.size === 0 || encounteredSequenceNumbers.size === dosages.length;
+    getProperty(key) {
+        return this.config[key];
     }
-    /**
-   * 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) {
-        let groups = {};
-        let sequences = new Set();
-        for(let idx = 0; idx < dosages.length; idx++){
-            const dosage = dosages[idx];
-            let sequenceNr = dosage.sequence || idx + 1;
-            let localGroup = groups[sequenceNr] || [];
-            localGroup.push(dosage);
-            groups[sequenceNr] = localGroup;
-            sequences.add(sequenceNr);
-        }
-        // By using the Set values, we are sure it is returned in the way Dosages were written
-        return Array.from(sequences, (sequence)=>groups[sequence]);
+    setProperty(key, value) {
+        this.config[key] = value;
     }
-    /**
-   * 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) {
+    async changeLanguage(lng) {
+        this.config["language"] = lng;
+        return this.i18nInstance.changeLanguage(lng);
+    }
+    getFields(dos, ...order) {
         let parts = order.map((entry)=>(0, $2c21ace90ecdbde6$export$9f330b4bf8c0975c)({
                 config: this.config,
                 dos: dos,
@@ -999,32 +932,30 @@ class $74b0cf9d3dbd5b46$export$1c191bca55f84a03 extends (0, $868b4eaa4f62b9f7$ex
             })).filter((0, $3d60081b7152576d$export$e7321bf46d18757f));
         return parts.join(this.config.displaySeparator);
     }
-    /**
-   * Turn a FHIR Dosage object into text
-   */ fromDosageToText(dos) {
+    fromDosageToText(dos) {
         let order = this.config.displayOrder;
         return this.getFields(dos, ...order);
     }
-    /**
-   * Turn multiple FHIR Dosage objects into text
-   */ fromMultipleDosageToText(dosages) {
-        const hasOnlySequentialInstructions = this.containsOnlySequentialInstructions(dosages);
-        if (hasOnlySequentialInstructions) {
-            const dosagesAsText = dosages.map((d)=>this.fromDosageToText(d));
-            return (0, $93b58b7d2ead3b95$export$826742c1df3eca39)(this.i18nInstance, dosagesAsText, "then");
-        }
-        let sortedDosages = this.groupBySequence(dosages);
-        let sequentialInstructions = sortedDosages.map((concurrentInstructions)=>{
-            let concurrentInstructionsAsString = concurrentInstructions.map((dosage)=>this.fromDosageToText(dosage));
-            return (0, $93b58b7d2ead3b95$export$826742c1df3eca39)(this.i18nInstance, concurrentInstructionsAsString, "and");
-        });
+    fromMultipleDosageToText(dosages) {
+        if (this.containsOnlySequentialInstructions(dosages)) return this.convertSequentialDosagesToText(dosages);
+        return this.convertGroupedDosagesToText(dosages);
+    }
+    convertSequentialDosagesToText(dosages) {
+        const dosagesAsText = dosages.map((d)=>this.fromDosageToText(d));
+        return (0, $93b58b7d2ead3b95$export$826742c1df3eca39)(this.i18nInstance, dosagesAsText, "then");
+    }
+    convertConcurrentDosagesToText(dosages) {
+        const concurrentInstructionsAsString = dosages.map((d)=>this.fromDosageToText(d));
+        return (0, $93b58b7d2ead3b95$export$826742c1df3eca39)(this.i18nInstance, concurrentInstructionsAsString, "and");
+    }
+    convertGroupedDosagesToText(dosages) {
+        const sortedDosages = this.groupBySequence(dosages);
+        const sequentialInstructions = sortedDosages.map((d)=>this.convertConcurrentDosagesToText(d));
         return (0, $93b58b7d2ead3b95$export$826742c1df3eca39)(this.i18nInstance, sequentialInstructions, "then");
     }
 }
 
 
-var // Default export to make it user-friendly
-$882b6d93070905b3$export$2e2bcd8739ae039 = (0, $74b0cf9d3dbd5b46$export$1c191bca55f84a03);
 
 
 //# sourceMappingURL=main.js.map